浏览代码

fix(android) update Gradle and the plugin to the latest versions

j8
Titus-Andrei Moldovan 4 年前
父节点
当前提交
de8079cc98
共有 3 个文件被更改,包括 29 次插入29 次删除
  1. 25
    25
      android/build.gradle
  2. 2
    2
      android/gradle/wrapper/gradle-wrapper.properties
  3. 2
    2
      android/sdk/build.gradle

+ 25
- 25
android/build.gradle 查看文件

@@ -9,12 +9,36 @@ buildscript {
9 9
         jcenter()
10 10
     }
11 11
     dependencies {
12
-        classpath 'com.android.tools.build:gradle:3.3.2'
12
+        classpath 'com.android.tools.build:gradle:4.0.1'
13 13
         classpath 'com.google.gms:google-services:4.3.3'
14 14
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
15 15
     }
16 16
 }
17 17
 
18
+ext {
19
+    buildToolsVersion = "29.0.3"
20
+    compileSdkVersion = 29
21
+    minSdkVersion    = 23
22
+    targetSdkVersion = 29
23
+    supportLibVersion = "28.0.0"
24
+
25
+    // The Maven artifact groupdId of the third-party react-native modules which
26
+    // Jitsi Meet SDK for Android depends on and which are not available in
27
+    // third-party Maven repositories so we have to deploy to a Maven repository
28
+    // of ours.
29
+    moduleGroupId = 'com.facebook.react'
30
+
31
+    // Maven repo where artifacts will be published
32
+    mavenRepo = System.env.MVN_REPO ?: ""
33
+    mavenUser = System.env.MVN_USER ?: ""
34
+    mavenPassword = System.env.MVN_PASSWORD ?: ""
35
+
36
+    // Libre build
37
+    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
38
+
39
+    googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
40
+}
41
+
18 42
 allprojects {
19 43
     repositories {
20 44
         google()
@@ -137,30 +161,6 @@ allprojects {
137 161
     }
138 162
 }
139 163
 
140
-ext {
141
-    buildToolsVersion = "29.0.3"
142
-    compileSdkVersion = 29
143
-    minSdkVersion    = 23
144
-    targetSdkVersion = 29
145
-    supportLibVersion = "28.0.0"
146
-
147
-    // The Maven artifact groupdId of the third-party react-native modules which
148
-    // Jitsi Meet SDK for Android depends on and which are not available in
149
-    // third-party Maven repositories so we have to deploy to a Maven repository
150
-    // of ours.
151
-    moduleGroupId = 'com.facebook.react'
152
-
153
-    // Maven repo where artifacts will be published
154
-    mavenRepo = System.env.MVN_REPO ?: ""
155
-    mavenUser = System.env.MVN_USER ?: ""
156
-    mavenPassword = System.env.MVN_PASSWORD ?: ""
157
-
158
-    // Libre build
159
-    libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
160
-
161
-    googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
162
-}
163
-
164 164
 // Force the version of the Android build tools we have chosen on all
165 165
 // subprojects. The forcing was introduced for react-native and the third-party
166 166
 // modules that we utilize such as react-native-background-timer.

+ 2
- 2
android/gradle/wrapper/gradle-wrapper.properties 查看文件

@@ -1,6 +1,6 @@
1
-#Fri Mar 08 13:36:51 CET 2019
1
+#Wed Sep 23 11:48:00 EEST 2020
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

+ 2
- 2
android/sdk/build.gradle 查看文件

@@ -144,7 +144,7 @@ android.libraryVariants.all { def variant ->
144 144
     mergeResourcesTask.dependsOn(currentBundleTask)
145 145
 
146 146
     mergeAssetsTask.doLast {
147
-        def assetsDir = mergeAssetsTask.outputDir
147
+        def assetsDir = mergeAssetsTask.outputDir.get()
148 148
 
149 149
         // Bundle sounds
150 150
         //
@@ -178,7 +178,7 @@ android.libraryVariants.all { def variant ->
178 178
         if (currentBundleTask.enabled) {
179 179
             copy {
180 180
                 from(resourcesDir)
181
-                into(mergeResourcesTask.outputDir)
181
+                into(mergeResourcesTask.outputDir.get())
182 182
             }
183 183
         }
184 184
     }

正在加载...
取消
保存