diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index fd03e602cf142c..8798ec968d54d2 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -141,25 +141,26 @@ task downloadJSC(dependsOn: createNativeDepsDirectories, type: Download) { } // Create Android.mk library module based on jsc from npm -task prepareJSC(dependsOn: downloadJSC) << { - def jscTar = tarTree(downloadJSC.dest) - def jscAAR = jscTar.matching({ it.include "**/android-jsc/**/*.aar" }).singleFile - def soFiles = zipTree(jscAAR).matching({ it.include "**/*.so" }) +task prepareJSC(dependsOn: downloadJSC) { + doLast { + def jscTar = tarTree(downloadJSC.dest) + def jscAAR = jscTar.matching({ it.include "**/android-jsc/**/*.aar" }).singleFile + def soFiles = zipTree(jscAAR).matching({ it.include "**/*.so" }) - def headerFiles = jscTar.matching({ it.include "**/include/*.h" }) + def headerFiles = jscTar.matching({ it.include "**/include/*.h" }) - copy { - from soFiles - from headerFiles - from "src/main/jni/third-party/jsc/Android.mk" + copy { + from soFiles + from headerFiles + from "src/main/jni/third-party/jsc/Android.mk" - filesMatching("**/*.h", { it.path = "JavaScriptCore/${it.name}"}) + filesMatching("**/*.h", { it.path = "JavaScriptCore/${it.name}" }) - includeEmptyDirs false - into "$thirdPartyNdkDir/jsc" + includeEmptyDirs false + into "$thirdPartyNdkDir/jsc" + } } } - task downloadNdkBuildDependencies { if (!boostPath) { dependsOn downloadBoost diff --git a/ReactAndroid/release.gradle b/ReactAndroid/release.gradle index 6fba6f20c98c43..a7b8a43b277252 100644 --- a/ReactAndroid/release.gradle +++ b/ReactAndroid/release.gradle @@ -92,8 +92,8 @@ afterEvaluate { project -> android.libraryVariants.all { variant -> def name = variant.name.capitalize() - task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) { - from variant.javaCompile.destinationDir + task "jar${name}"(type: Jar, dependsOn: variant.javaCompileProvider.get()) { + from variant.javaCompileProvider.get().destinationDir } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d76b502e226a5c..c3d272aa60380f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ +#Thu Jan 24 16:45:50 BRST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +android.debug.obsoleteApi=true diff --git a/react.gradle b/react.gradle index f44d369df1b887..57027dd3f8bf34 100644 --- a/react.gradle +++ b/react.gradle @@ -92,11 +92,11 @@ afterEvaluate { } else { variant.registerResGeneratingTask(currentBundleTask) } - variant.mergeResources.dependsOn(currentBundleTask) + variant.mergeResourcesProvider.get().dependsOn(currentBundleTask) // packageApplication for Android plugin 3.x def packageTask = variant.hasProperty("packageApplication") - ? variant.packageApplication + ? variant.packageApplicationProvider.get() : tasks.findByName("package${targetName}") if (variant.hasProperty("packageLibrary")) { packageTask = variant.packageLibrary @@ -149,7 +149,7 @@ afterEvaluate { } // mergeAssets must run first, as it clears the intermediates directory - dependsOn(variant.mergeAssets) + dependsOn(variant.mergeAssetsProvider.get()) enabled currentBundleTask.enabled }