fix(android) update Gradle and the plugin to the latest versions
This commit is contained in:
parent
2a9805f9b1
commit
de8079cc98
|
@ -9,12 +9,36 @@ buildscript {
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:3.3.2'
|
classpath 'com.android.tools.build:gradle:4.0.1'
|
||||||
classpath 'com.google.gms:google-services:4.3.3'
|
classpath 'com.google.gms:google-services:4.3.3'
|
||||||
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
|
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ext {
|
||||||
|
buildToolsVersion = "29.0.3"
|
||||||
|
compileSdkVersion = 29
|
||||||
|
minSdkVersion = 23
|
||||||
|
targetSdkVersion = 29
|
||||||
|
supportLibVersion = "28.0.0"
|
||||||
|
|
||||||
|
// The Maven artifact groupdId of the third-party react-native modules which
|
||||||
|
// Jitsi Meet SDK for Android depends on and which are not available in
|
||||||
|
// third-party Maven repositories so we have to deploy to a Maven repository
|
||||||
|
// of ours.
|
||||||
|
moduleGroupId = 'com.facebook.react'
|
||||||
|
|
||||||
|
// Maven repo where artifacts will be published
|
||||||
|
mavenRepo = System.env.MVN_REPO ?: ""
|
||||||
|
mavenUser = System.env.MVN_USER ?: ""
|
||||||
|
mavenPassword = System.env.MVN_PASSWORD ?: ""
|
||||||
|
|
||||||
|
// Libre build
|
||||||
|
libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
|
||||||
|
|
||||||
|
googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
|
||||||
|
}
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
|
@ -137,30 +161,6 @@ allprojects {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
|
||||||
buildToolsVersion = "29.0.3"
|
|
||||||
compileSdkVersion = 29
|
|
||||||
minSdkVersion = 23
|
|
||||||
targetSdkVersion = 29
|
|
||||||
supportLibVersion = "28.0.0"
|
|
||||||
|
|
||||||
// The Maven artifact groupdId of the third-party react-native modules which
|
|
||||||
// Jitsi Meet SDK for Android depends on and which are not available in
|
|
||||||
// third-party Maven repositories so we have to deploy to a Maven repository
|
|
||||||
// of ours.
|
|
||||||
moduleGroupId = 'com.facebook.react'
|
|
||||||
|
|
||||||
// Maven repo where artifacts will be published
|
|
||||||
mavenRepo = System.env.MVN_REPO ?: ""
|
|
||||||
mavenUser = System.env.MVN_USER ?: ""
|
|
||||||
mavenPassword = System.env.MVN_PASSWORD ?: ""
|
|
||||||
|
|
||||||
// Libre build
|
|
||||||
libreBuild = (System.env.LIBRE_BUILD ?: "false").toBoolean()
|
|
||||||
|
|
||||||
googleServicesEnabled = project.file('app/google-services.json').exists() && !libreBuild
|
|
||||||
}
|
|
||||||
|
|
||||||
// Force the version of the Android build tools we have chosen on all
|
// Force the version of the Android build tools we have chosen on all
|
||||||
// subprojects. The forcing was introduced for react-native and the third-party
|
// subprojects. The forcing was introduced for react-native and the third-party
|
||||||
// modules that we utilize such as react-native-background-timer.
|
// modules that we utilize such as react-native-background-timer.
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#Fri Mar 08 13:36:51 CET 2019
|
#Wed Sep 23 11:48:00 EEST 2020
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
|
||||||
|
|
|
@ -144,7 +144,7 @@ android.libraryVariants.all { def variant ->
|
||||||
mergeResourcesTask.dependsOn(currentBundleTask)
|
mergeResourcesTask.dependsOn(currentBundleTask)
|
||||||
|
|
||||||
mergeAssetsTask.doLast {
|
mergeAssetsTask.doLast {
|
||||||
def assetsDir = mergeAssetsTask.outputDir
|
def assetsDir = mergeAssetsTask.outputDir.get()
|
||||||
|
|
||||||
// Bundle sounds
|
// Bundle sounds
|
||||||
//
|
//
|
||||||
|
@ -178,7 +178,7 @@ android.libraryVariants.all { def variant ->
|
||||||
if (currentBundleTask.enabled) {
|
if (currentBundleTask.enabled) {
|
||||||
copy {
|
copy {
|
||||||
from(resourcesDir)
|
from(resourcesDir)
|
||||||
into(mergeResourcesTask.outputDir)
|
into(mergeResourcesTask.outputDir.get())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue