android: update gradle plugin version

pull/3977/head jitsi-meet_3585
Saúl Ibarra Corretgé 6 years ago
parent 3f2a559d64
commit c737d46d90
  1. 17
      android/app/build.gradle
  2. 2
      android/build.gradle
  3. 4
      android/gradle/wrapper/gradle-wrapper.properties
  4. 18
      android/sdk/build.gradle

@ -115,16 +115,13 @@ gradle.projectsEvaluated {
android.applicationVariants.all { variant -> android.applicationVariants.all { variant ->
variant.outputs.each { output -> variant.outputs.each { output ->
output.processManifest.doLast { output.processManifest.doLast {
def f = new File(manifestOutputDirectory, 'AndroidManifest.xml') def outputDir = manifestOutputDirectory.get().asFile
if (!f.isFile()) { def manifestPath = new File(outputDir, 'AndroidManifest.xml')
f = new File(new File(manifestOutputDirectory, output.dirName), 'AndroidManifest.xml') def charset = 'UTF-8'
} def text
if (f.exists()) { text = manifestPath.getText(charset)
def charset = 'UTF-8' text = text.replace('</application>', "${dropboxActivity}</application>")
def s = f.getText(charset) manifestPath.write(text, charset)
s = s.replace('</application>', "${dropboxActivity}</application>")
f.write(s, charset)
}
} }
} }
} }

@ -12,7 +12,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.google.gms:google-services:4.2.0' classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.27.0' classpath 'io.fabric.tools:gradle:1.27.0'

@ -1,6 +1,6 @@
#Wed Dec 19 12:02:47 CET 2018 #Fri Mar 08 13:36:51 CET 2019
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.7-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

@ -107,13 +107,17 @@ android.libraryVariants.all { def variant ->
currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask) currentBundleTask.ext.generatedResFolders = files(resourcesDir).builtBy(currentBundleTask)
currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask) currentBundleTask.ext.generatedAssetsFolders = files(jsBundleDir).builtBy(currentBundleTask)
variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders) variant.registerGeneratedResFolders(currentBundleTask.generatedResFolders)
variant.mergeResources.dependsOn(currentBundleTask)
def assetsDir = variant.mergeAssets.outputDir def mergeAssetsTask = variant.mergeAssetsProvider.get()
def mergeResourcesTask = variant.mergeResourcesProvider.get()
mergeAssetsTask.dependsOn(currentBundleTask)
mergeResourcesTask.dependsOn(currentBundleTask)
mergeAssetsTask.doLast {
def assetsDir = mergeAssetsTask.outputDir
variant.mergeAssets.doLast {
// Bundle fonts // Bundle fonts
// //
copy { copy {
@ -139,19 +143,19 @@ android.libraryVariants.all { def variant ->
// //
if (currentBundleTask.enabled) { if (currentBundleTask.enabled) {
copy { copy {
from(jsBundleDir) from(jsBundleFile)
into(assetsDir) into(assetsDir)
} }
} }
} }
variant.mergeResources.doLast { mergeResourcesTask.doLast {
// Copy React resources // Copy React resources
// //
if (currentBundleTask.enabled) { if (currentBundleTask.enabled) {
copy { copy {
from(resourcesDir) from(resourcesDir)
into(variant.mergeResources.outputDir) into(mergeResourcesTask.outputDir)
} }
} }
} }

Loading…
Cancel
Save