Ver código fonte

android: update gradle plugin version

master
Saúl Ibarra Corretgé 6 anos atrás
pai
commit
c737d46d90

+ 7
- 10
android/app/build.gradle Ver arquivo

115
         android.applicationVariants.all { variant ->
115
         android.applicationVariants.all { variant ->
116
             variant.outputs.each { output ->
116
             variant.outputs.each { output ->
117
                 output.processManifest.doLast {
117
                 output.processManifest.doLast {
118
-                    def f = new File(manifestOutputDirectory, 'AndroidManifest.xml')
119
-                    if (!f.isFile()) {
120
-                        f = new File(new File(manifestOutputDirectory, output.dirName), 'AndroidManifest.xml')
121
-                    }
122
-                    if (f.exists()) {
123
-                        def charset = 'UTF-8'
124
-                        def s = f.getText(charset)
125
-                        s = s.replace('</application>', "${dropboxActivity}</application>")
126
-                        f.write(s, charset)
127
-                    }
118
+                    def outputDir = manifestOutputDirectory.get().asFile
119
+                    def manifestPath = new File(outputDir, 'AndroidManifest.xml')
120
+                    def charset = 'UTF-8'
121
+                    def text
122
+                    text = manifestPath.getText(charset)
123
+                    text = text.replace('</application>', "${dropboxActivity}</application>")
124
+                    manifestPath.write(text, charset)
128
                 }
125
                 }
129
             }
126
             }
130
         }
127
         }

+ 1
- 1
android/build.gradle Ver arquivo

12
         }
12
         }
13
     }
13
     }
14
     dependencies {
14
     dependencies {
15
-        classpath 'com.android.tools.build:gradle:3.2.1'
15
+        classpath 'com.android.tools.build:gradle:3.3.2'
16
         classpath 'com.google.gms:google-services:4.2.0'
16
         classpath 'com.google.gms:google-services:4.2.0'
17
         classpath 'io.fabric.tools:gradle:1.27.0'
17
         classpath 'io.fabric.tools:gradle:1.27.0'
18
 
18
 

+ 2
- 2
android/gradle/wrapper/gradle-wrapper.properties Ver arquivo

1
-#Wed Dec 19 12:02:47 CET 2018
1
+#Fri Mar 08 13:36:51 CET 2019
2
 distributionBase=GRADLE_USER_HOME
2
 distributionBase=GRADLE_USER_HOME
3
 distributionPath=wrapper/dists
3
 distributionPath=wrapper/dists
4
 zipStoreBase=GRADLE_USER_HOME
4
 zipStoreBase=GRADLE_USER_HOME
5
 zipStorePath=wrapper/dists
5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

+ 11
- 7
android/sdk/build.gradle Ver arquivo

107
 
107
 
108
     currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
108
     currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
109
     currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
109
     currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
110
-
111
     variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
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
         // Bundle fonts
121
         // Bundle fonts
118
         //
122
         //
119
         copy {
123
         copy {
139
         //
143
         //
140
         if (currentBundleTask.enabled) {
144
         if (currentBundleTask.enabled) {
141
             copy {
145
             copy {
142
-                from(jsBundleDir)
146
+                from(jsBundleFile)
143
                 into(assetsDir)
147
                 into(assetsDir)
144
             }
148
             }
145
         }
149
         }
146
     }
150
     }
147
 
151
 
148
-    variant.mergeResources.doLast {
152
+    mergeResourcesTask.doLast {
149
         // Copy React resources
153
         // Copy React resources
150
         //
154
         //
151
         if (currentBundleTask.enabled) {
155
         if (currentBundleTask.enabled) {
152
             copy {
156
             copy {
153
                 from(resourcesDir)
157
                 from(resourcesDir)
154
-                into(variant.mergeResources.outputDir)
158
+                into(mergeResourcesTask.outputDir)
155
             }
159
             }
156
         }
160
         }
157
     }
161
     }

Carregando…
Cancelar
Salvar