|
@@ -107,13 +107,17 @@ android.libraryVariants.all { def variant ->
|
107
|
107
|
|
108
|
108
|
currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
|
109
|
109
|
currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
|
110
|
|
-
|
111
|
110
|
variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
|
112
|
|
- variant.mergeResources.dependsOn(currentBundleTask)
|
113
|
111
|
|
114
|
|
- def assetsDir = variant.mergeAssets.outputDir
|
|
112
|
+ def mergeAssetsTask = variant.mergeAssetsProvider.get()
|
|
113
|
+ def mergeResourcesTask = variant.mergeResourcesProvider.get()
|
|
114
|
+
|
|
115
|
+ mergeAssetsTask.dependsOn(currentBundleTask)
|
|
116
|
+ mergeResourcesTask.dependsOn(currentBundleTask)
|
|
117
|
+
|
|
118
|
+ mergeAssetsTask.doLast {
|
|
119
|
+ def assetsDir = mergeAssetsTask.outputDir
|
115
|
120
|
|
116
|
|
- variant.mergeAssets.doLast {
|
117
|
121
|
// Bundle fonts
|
118
|
122
|
//
|
119
|
123
|
copy {
|
|
@@ -139,19 +143,19 @@ android.libraryVariants.all { def variant ->
|
139
|
143
|
//
|
140
|
144
|
if (currentBundleTask.enabled) {
|
141
|
145
|
copy {
|
142
|
|
- from(jsBundleDir)
|
|
146
|
+ from(jsBundleFile)
|
143
|
147
|
into(assetsDir)
|
144
|
148
|
}
|
145
|
149
|
}
|
146
|
150
|
}
|
147
|
151
|
|
148
|
|
- variant.mergeResources.doLast {
|
|
152
|
+ mergeResourcesTask.doLast {
|
149
|
153
|
// Copy React resources
|
150
|
154
|
//
|
151
|
155
|
if (currentBundleTask.enabled) {
|
152
|
156
|
copy {
|
153
|
157
|
from(resourcesDir)
|
154
|
|
- into(variant.mergeResources.outputDir)
|
|
158
|
+ into(mergeResourcesTask.outputDir)
|
155
|
159
|
}
|
156
|
160
|
}
|
157
|
161
|
}
|