From 14921d0c0613134091a76abe42d153810d0443b7 Mon Sep 17 00:00:00 2001 From: xster Date: Fri, 4 Jun 2021 14:25:47 -0700 Subject: [PATCH] Use a newer version of gradle to avoid an AGP bug around NDK (#797) --- add_to_app/fullscreen/android_fullscreen/app/build.gradle | 1 + add_to_app/fullscreen/android_fullscreen/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 6 +++--- add_to_app/plugin/android_using_plugin/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 3 +-- .../android_using_prebuilt_module/build.gradle | 3 +-- .../gradle/wrapper/gradle-wrapper.properties | 3 +-- 7 files changed, 9 insertions(+), 11 deletions(-) diff --git a/add_to_app/fullscreen/android_fullscreen/app/build.gradle b/add_to_app/fullscreen/android_fullscreen/app/build.gradle index cb26dce65..f1d4e6303 100644 --- a/add_to_app/fullscreen/android_fullscreen/app/build.gradle +++ b/add_to_app/fullscreen/android_fullscreen/app/build.gradle @@ -18,6 +18,7 @@ android { buildTypes { release { minifyEnabled false + signingConfig debug.signingConfig } } compileOptions { diff --git a/add_to_app/fullscreen/android_fullscreen/build.gradle b/add_to_app/fullscreen/android_fullscreen/build.gradle index d35e43dc9..8a9608782 100644 --- a/add_to_app/fullscreen/android_fullscreen/build.gradle +++ b/add_to_app/fullscreen/android_fullscreen/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties b/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties index 9833519b2..915e3c705 100644 --- a/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties +++ b/add_to_app/fullscreen/android_fullscreen/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 11 09:25:37 PDT 2020 +#Mon May 17 23:38:12 PDT 2021 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/add_to_app/plugin/android_using_plugin/build.gradle b/add_to_app/plugin/android_using_plugin/build.gradle index e796b11e6..8a9608782 100644 --- a/add_to_app/plugin/android_using_plugin/build.gradle +++ b/add_to_app/plugin/android_using_plugin/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties b/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties index 83e0f19b1..641b07710 100644 --- a/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties +++ b/add_to_app/plugin/android_using_plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ #Sun Oct 13 15:03:51 PDT 2019 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle index 4fdf2c0c7..8a9608782 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/build.gradle @@ -5,10 +5,9 @@ buildscript { repositories { google() jcenter() - } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties index 85a5ca2b9..4cca04ace 100644 --- a/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties +++ b/add_to_app/prebuilt_module/android_using_prebuilt_module/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ #Wed Oct 23 10:17:48 PDT 2019 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip