From 93837e9cc5964c701f02b7783a81fb3a2927c543 Mon Sep 17 00:00:00 2001 From: gfan Date: Tue, 4 May 2021 20:46:47 -0700 Subject: [PATCH] Update to AGP(Android gradle plugin)4.2.0 --- .ci_tools/setup_env.sh | 5 +++-- audio-echo/app/build.gradle | 2 +- audio-echo/build.gradle | 2 +- audio-echo/gradle/wrapper/gradle-wrapper.properties | 2 +- bitmap-plasma/app/build.gradle | 2 +- bitmap-plasma/build.gradle | 2 +- bitmap-plasma/gradle/wrapper/gradle-wrapper.properties | 2 +- builder/gradle/wrapper/gradle-wrapper.properties | 2 +- camera/basic/build.gradle | 2 +- camera/build.gradle | 2 +- camera/gradle/wrapper/gradle-wrapper.properties | 2 +- camera/texture-view/build.gradle | 2 +- display-p3/build.gradle | 2 +- display-p3/gradle/wrapper/gradle-wrapper.properties | 2 +- display-p3/image-view/build.gradle | 2 +- endless-tunnel/app/build.gradle | 2 +- endless-tunnel/build.gradle | 2 +- endless-tunnel/gradle/wrapper/gradle-wrapper.properties | 2 +- gles3jni/app/build.gradle | 2 +- gles3jni/build.gradle | 2 +- gles3jni/gradle/wrapper/gradle-wrapper.properties | 2 +- hello-gl2/app/build.gradle | 2 +- hello-gl2/build.gradle | 2 +- hello-gl2/gradle/wrapper/gradle-wrapper.properties | 2 +- hello-jni/build.gradle | 2 +- hello-jni/gradle/wrapper/gradle-wrapper.properties | 2 +- hello-jniCallback/app/build.gradle | 2 +- hello-jniCallback/build.gradle | 2 +- hello-jniCallback/gradle/wrapper/gradle-wrapper.properties | 2 +- hello-libs/app/build.gradle | 2 +- hello-libs/build.gradle | 2 +- hello-libs/gen-libs/build.gradle | 2 +- hello-libs/gradle/wrapper/gradle-wrapper.properties | 2 +- hello-neon/app/build.gradle | 2 +- hello-neon/build.gradle | 2 +- hello-neon/gradle/wrapper/gradle-wrapper.properties | 2 +- hello-oboe/app/build.gradle | 2 +- hello-oboe/build.gradle | 2 +- hello-oboe/gradle/wrapper/gradle-wrapper.properties | 2 +- native-activity/app/build.gradle | 2 +- native-activity/build.gradle | 2 +- native-activity/gradle/wrapper/gradle-wrapper.properties | 2 +- native-audio/app/build.gradle | 2 +- native-audio/build.gradle | 2 +- native-audio/gradle/wrapper/gradle-wrapper.properties | 2 +- native-codec/app/build.gradle | 2 +- native-codec/build.gradle | 2 +- native-codec/gradle/wrapper/gradle-wrapper.properties | 2 +- native-media/app/build.gradle | 2 +- native-media/build.gradle | 2 +- native-media/gradle/wrapper/gradle-wrapper.properties | 2 +- native-midi/app/build.gradle | 2 +- native-midi/build.gradle | 2 +- native-midi/gradle/wrapper/gradle-wrapper.properties | 2 +- native-plasma/app/build.gradle | 2 +- native-plasma/build.gradle | 2 +- native-plasma/gradle/wrapper/gradle-wrapper.properties | 2 +- nn-samples/basic/build.gradle | 2 +- nn-samples/build.gradle | 2 +- nn-samples/gradle/wrapper/gradle-wrapper.properties | 2 +- nn-samples/sequence/build.gradle | 2 +- other-builds/ndkbuild/bitmap-plasma/build.gradle | 2 +- .../bitmap-plasma/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/gles3jni/build.gradle | 2 +- .../gles3jni/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/hello-gl2/build.gradle | 2 +- .../hello-gl2/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/hello-jni/build.gradle | 2 +- .../hello-jni/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/hello-libs/build.gradle | 2 +- .../hello-libs/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/hello-neon/build.gradle | 2 +- .../hello-neon/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/native-activity/build.gradle | 2 +- .../native-activity/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/native-audio/build.gradle | 2 +- .../native-audio/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/native-codec/build.gradle | 2 +- .../native-codec/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/native-media/build.gradle | 2 +- .../native-media/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/native-plasma/build.gradle | 2 +- .../native-plasma/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/nn-samples/build.gradle | 2 +- .../nn-samples/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/san-angeles/build.gradle | 2 +- .../san-angeles/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/teapots/build.gradle | 2 +- .../teapots/gradle/wrapper/gradle-wrapper.properties | 2 +- other-builds/ndkbuild/two-libs/build.gradle | 2 +- .../two-libs/gradle/wrapper/gradle-wrapper.properties | 2 +- prefab/curl-ssl/app/build.gradle | 1 + prefab/curl-ssl/build.gradle | 2 +- prefab/curl-ssl/gradle.properties | 2 -- prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties | 2 +- prefab/prefab-dependency/app/build.gradle | 3 +++ prefab/prefab-dependency/build.gradle | 2 +- prefab/prefab-dependency/gradle.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- prefab/prefab-publishing/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- san-angeles/app/build.gradle | 2 +- san-angeles/build.gradle | 2 +- san-angeles/gradle/wrapper/gradle-wrapper.properties | 2 +- sensor-graph/accelerometer/build.gradle | 2 +- sensor-graph/build.gradle | 2 +- sensor-graph/gradle/wrapper/gradle-wrapper.properties | 2 +- teapots/build.gradle | 2 +- teapots/choreographer-30fps/build.gradle | 2 +- teapots/classic-teapot/build.gradle | 2 +- teapots/gradle/wrapper/gradle-wrapper.properties | 2 +- teapots/image-decoder/build.gradle | 2 +- teapots/more-teapots/build.gradle | 2 +- teapots/textured-teapot/build.gradle | 2 +- webp/build.gradle | 2 +- webp/gradle/wrapper/gradle-wrapper.properties | 2 +- 116 files changed, 119 insertions(+), 116 deletions(-) diff --git a/.ci_tools/setup_env.sh b/.ci_tools/setup_env.sh index ef2dc5abd..a650da8f3 100755 --- a/.ci_tools/setup_env.sh +++ b/.ci_tools/setup_env.sh @@ -92,8 +92,9 @@ while read -r version_; do done < $TMP_SETUP_FILENAME # echo "NDK versions:"; cat $TMP_SETUP_FILENAME -# add cmake installation later - +# add customized cmake installation +echo y | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "cmake;3.18.1" + rm -f $TMP_SETUP_FILENAME diff --git a/audio-echo/app/build.gradle b/audio-echo/app/build.gradle index 342e1bbc0..49862064d 100644 --- a/audio-echo/app/build.gradle +++ b/audio-echo/app/build.gradle @@ -30,7 +30,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/audio-echo/build.gradle b/audio-echo/build.gradle index 97f7d06bf..34d051e66 100644 --- a/audio-echo/build.gradle +++ b/audio-echo/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/audio-echo/gradle/wrapper/gradle-wrapper.properties b/audio-echo/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/audio-echo/gradle/wrapper/gradle-wrapper.properties +++ b/audio-echo/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/bitmap-plasma/app/build.gradle b/bitmap-plasma/app/build.gradle index 108353656..bb9e5f934 100644 --- a/bitmap-plasma/app/build.gradle +++ b/bitmap-plasma/app/build.gradle @@ -18,7 +18,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/bitmap-plasma/build.gradle b/bitmap-plasma/build.gradle index fc82e6802..b16ce11ac 100644 --- a/bitmap-plasma/build.gradle +++ b/bitmap-plasma/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties b/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties +++ b/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/builder/gradle/wrapper/gradle-wrapper.properties b/builder/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/builder/gradle/wrapper/gradle-wrapper.properties +++ b/builder/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/camera/basic/build.gradle b/camera/basic/build.gradle index cd06e0814..0a2e26314 100644 --- a/camera/basic/build.gradle +++ b/camera/basic/build.gradle @@ -26,7 +26,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/camera/build.gradle b/camera/build.gradle index fc82e6802..b16ce11ac 100644 --- a/camera/build.gradle +++ b/camera/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/camera/gradle/wrapper/gradle-wrapper.properties b/camera/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/camera/gradle/wrapper/gradle-wrapper.properties +++ b/camera/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/camera/texture-view/build.gradle b/camera/texture-view/build.gradle index cc06080c0..2f081f006 100644 --- a/camera/texture-view/build.gradle +++ b/camera/texture-view/build.gradle @@ -17,7 +17,7 @@ android { externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/display-p3/build.gradle b/display-p3/build.gradle index 277953199..5ead1927a 100644 --- a/display-p3/build.gradle +++ b/display-p3/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/display-p3/gradle/wrapper/gradle-wrapper.properties b/display-p3/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/display-p3/gradle/wrapper/gradle-wrapper.properties +++ b/display-p3/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/display-p3/image-view/build.gradle b/display-p3/image-view/build.gradle index 5c56ee345..835bb180b 100644 --- a/display-p3/image-view/build.gradle +++ b/display-p3/image-view/build.gradle @@ -24,7 +24,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/endless-tunnel/app/build.gradle b/endless-tunnel/app/build.gradle index d4b490b55..97f75cb1e 100644 --- a/endless-tunnel/app/build.gradle +++ b/endless-tunnel/app/build.gradle @@ -41,7 +41,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/endless-tunnel/build.gradle b/endless-tunnel/build.gradle index fc82e6802..b16ce11ac 100644 --- a/endless-tunnel/build.gradle +++ b/endless-tunnel/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/endless-tunnel/gradle/wrapper/gradle-wrapper.properties b/endless-tunnel/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/endless-tunnel/gradle/wrapper/gradle-wrapper.properties +++ b/endless-tunnel/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gles3jni/app/build.gradle b/gles3jni/app/build.gradle index 69324db78..212c2c20b 100644 --- a/gles3jni/app/build.gradle +++ b/gles3jni/app/build.gradle @@ -27,7 +27,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/gles3jni/build.gradle b/gles3jni/build.gradle index fc82e6802..b16ce11ac 100644 --- a/gles3jni/build.gradle +++ b/gles3jni/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/gles3jni/gradle/wrapper/gradle-wrapper.properties b/gles3jni/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/gles3jni/gradle/wrapper/gradle-wrapper.properties +++ b/gles3jni/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-gl2/app/build.gradle b/hello-gl2/app/build.gradle index f883e637b..14f5d934c 100644 --- a/hello-gl2/app/build.gradle +++ b/hello-gl2/app/build.gradle @@ -25,7 +25,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/hello-gl2/build.gradle b/hello-gl2/build.gradle index fc82e6802..b16ce11ac 100644 --- a/hello-gl2/build.gradle +++ b/hello-gl2/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/hello-gl2/gradle/wrapper/gradle-wrapper.properties b/hello-gl2/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/hello-gl2/gradle/wrapper/gradle-wrapper.properties +++ b/hello-gl2/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-jni/build.gradle b/hello-jni/build.gradle index 06a3a6e92..329d09504 100644 --- a/hello-jni/build.gradle +++ b/hello-jni/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/hello-jni/gradle/wrapper/gradle-wrapper.properties b/hello-jni/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/hello-jni/gradle/wrapper/gradle-wrapper.properties +++ b/hello-jni/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-jniCallback/app/build.gradle b/hello-jniCallback/app/build.gradle index 5e09c5ae2..d24956984 100644 --- a/hello-jniCallback/app/build.gradle +++ b/hello-jniCallback/app/build.gradle @@ -20,7 +20,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path "src/main/cpp/CMakeLists.txt" } } diff --git a/hello-jniCallback/build.gradle b/hello-jniCallback/build.gradle index 4dc1795ee..14d2ecd6a 100644 --- a/hello-jniCallback/build.gradle +++ b/hello-jniCallback/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties b/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties +++ b/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-libs/app/build.gradle b/hello-libs/app/build.gradle index c4d51d128..1cc4f009c 100644 --- a/hello-libs/app/build.gradle +++ b/hello-libs/app/build.gradle @@ -26,7 +26,7 @@ android { externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/hello-libs/build.gradle b/hello-libs/build.gradle index 4dc1795ee..14d2ecd6a 100644 --- a/hello-libs/build.gradle +++ b/hello-libs/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/hello-libs/gen-libs/build.gradle b/hello-libs/gen-libs/build.gradle index 5352848d7..87931b8d3 100644 --- a/hello-libs/gen-libs/build.gradle +++ b/hello-libs/gen-libs/build.gradle @@ -27,7 +27,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/hello-libs/gradle/wrapper/gradle-wrapper.properties b/hello-libs/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/hello-libs/gradle/wrapper/gradle-wrapper.properties +++ b/hello-libs/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-neon/app/build.gradle b/hello-neon/app/build.gradle index 0577ea226..691edddad 100644 --- a/hello-neon/app/build.gradle +++ b/hello-neon/app/build.gradle @@ -21,7 +21,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/hello-neon/build.gradle b/hello-neon/build.gradle index 4dc1795ee..14d2ecd6a 100644 --- a/hello-neon/build.gradle +++ b/hello-neon/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/hello-neon/gradle/wrapper/gradle-wrapper.properties b/hello-neon/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/hello-neon/gradle/wrapper/gradle-wrapper.properties +++ b/hello-neon/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-oboe/app/build.gradle b/hello-oboe/app/build.gradle index ba9f307b3..bc432c141 100644 --- a/hello-oboe/app/build.gradle +++ b/hello-oboe/app/build.gradle @@ -27,7 +27,7 @@ android { externalNativeBuild { cmake { path "src/main/cpp/CMakeLists.txt" - version "3.10.2" + version "3.18.1" } } } diff --git a/hello-oboe/build.gradle b/hello-oboe/build.gradle index e2bafd4e7..f48a50ea8 100644 --- a/hello-oboe/build.gradle +++ b/hello-oboe/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' 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/hello-oboe/gradle/wrapper/gradle-wrapper.properties b/hello-oboe/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/hello-oboe/gradle/wrapper/gradle-wrapper.properties +++ b/hello-oboe/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-activity/app/build.gradle b/native-activity/app/build.gradle index 9581f797d..8366a55aa 100644 --- a/native-activity/app/build.gradle +++ b/native-activity/app/build.gradle @@ -23,7 +23,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/native-activity/build.gradle b/native-activity/build.gradle index 277953199..5ead1927a 100644 --- a/native-activity/build.gradle +++ b/native-activity/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/native-activity/gradle/wrapper/gradle-wrapper.properties b/native-activity/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/native-activity/gradle/wrapper/gradle-wrapper.properties +++ b/native-activity/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-audio/app/build.gradle b/native-audio/app/build.gradle index e3653b6a8..66ef3397a 100644 --- a/native-audio/app/build.gradle +++ b/native-audio/app/build.gradle @@ -19,7 +19,7 @@ android { externalNativeBuild { cmake { // todo: need to disable REVERT for fast audio recording - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/native-audio/build.gradle b/native-audio/build.gradle index fc82e6802..b16ce11ac 100644 --- a/native-audio/build.gradle +++ b/native-audio/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/native-audio/gradle/wrapper/gradle-wrapper.properties b/native-audio/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/native-audio/gradle/wrapper/gradle-wrapper.properties +++ b/native-audio/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-codec/app/build.gradle b/native-codec/app/build.gradle index 17cd32de8..863ec2b0d 100644 --- a/native-codec/app/build.gradle +++ b/native-codec/app/build.gradle @@ -23,7 +23,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/native-codec/build.gradle b/native-codec/build.gradle index fc82e6802..b16ce11ac 100644 --- a/native-codec/build.gradle +++ b/native-codec/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/native-codec/gradle/wrapper/gradle-wrapper.properties b/native-codec/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/native-codec/gradle/wrapper/gradle-wrapper.properties +++ b/native-codec/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-media/app/build.gradle b/native-media/app/build.gradle index 6b743c220..2eb4e0e18 100644 --- a/native-media/app/build.gradle +++ b/native-media/app/build.gradle @@ -18,7 +18,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/native-media/build.gradle b/native-media/build.gradle index fc82e6802..b16ce11ac 100644 --- a/native-media/build.gradle +++ b/native-media/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/native-media/gradle/wrapper/gradle-wrapper.properties b/native-media/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/native-media/gradle/wrapper/gradle-wrapper.properties +++ b/native-media/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-midi/app/build.gradle b/native-midi/app/build.gradle index 710cc83d2..26b0695df 100644 --- a/native-midi/app/build.gradle +++ b/native-midi/app/build.gradle @@ -26,7 +26,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path "src/main/cpp/CMakeLists.txt" } } diff --git a/native-midi/build.gradle b/native-midi/build.gradle index 0acabe96a..c14e88f86 100644 --- a/native-midi/build.gradle +++ b/native-midi/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/native-midi/gradle/wrapper/gradle-wrapper.properties b/native-midi/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/native-midi/gradle/wrapper/gradle-wrapper.properties +++ b/native-midi/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-plasma/app/build.gradle b/native-plasma/app/build.gradle index 9581a7a22..6b44cb713 100644 --- a/native-plasma/app/build.gradle +++ b/native-plasma/app/build.gradle @@ -18,7 +18,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/native-plasma/build.gradle b/native-plasma/build.gradle index fc82e6802..b16ce11ac 100644 --- a/native-plasma/build.gradle +++ b/native-plasma/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/native-plasma/gradle/wrapper/gradle-wrapper.properties b/native-plasma/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/native-plasma/gradle/wrapper/gradle-wrapper.properties +++ b/native-plasma/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/nn-samples/basic/build.gradle b/nn-samples/basic/build.gradle index 0986baa33..1b34a4915 100644 --- a/nn-samples/basic/build.gradle +++ b/nn-samples/basic/build.gradle @@ -30,7 +30,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path "src/main/cpp/CMakeLists.txt" } } diff --git a/nn-samples/build.gradle b/nn-samples/build.gradle index 06a3a6e92..329d09504 100644 --- a/nn-samples/build.gradle +++ b/nn-samples/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong diff --git a/nn-samples/gradle/wrapper/gradle-wrapper.properties b/nn-samples/gradle/wrapper/gradle-wrapper.properties index 2a05e5ee4..63d9dbcf6 100644 --- a/nn-samples/gradle/wrapper/gradle-wrapper.properties +++ b/nn-samples/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/nn-samples/sequence/build.gradle b/nn-samples/sequence/build.gradle index bb66bd2dd..a0e7a28a8 100644 --- a/nn-samples/sequence/build.gradle +++ b/nn-samples/sequence/build.gradle @@ -25,7 +25,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path "src/main/cpp/CMakeLists.txt" } } diff --git a/other-builds/ndkbuild/bitmap-plasma/build.gradle b/other-builds/ndkbuild/bitmap-plasma/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/bitmap-plasma/build.gradle +++ b/other-builds/ndkbuild/bitmap-plasma/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties index bbfbe40ec..42ecd62e9 100644 --- a/other-builds/ndkbuild/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/gles3jni/build.gradle b/other-builds/ndkbuild/gles3jni/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/gles3jni/build.gradle +++ b/other-builds/ndkbuild/gles3jni/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/gles3jni/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/gles3jni/gradle/wrapper/gradle-wrapper.properties index 79af18b51..d4257aec6 100644 --- a/other-builds/ndkbuild/gles3jni/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/gles3jni/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/hello-gl2/build.gradle b/other-builds/ndkbuild/hello-gl2/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/hello-gl2/build.gradle +++ b/other-builds/ndkbuild/hello-gl2/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/hello-gl2/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/hello-gl2/gradle/wrapper/gradle-wrapper.properties index 8d96057a8..81758e3b5 100644 --- a/other-builds/ndkbuild/hello-gl2/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/hello-gl2/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/hello-jni/build.gradle b/other-builds/ndkbuild/hello-jni/build.gradle index a6ec611b8..664113e24 100644 --- a/other-builds/ndkbuild/hello-jni/build.gradle +++ b/other-builds/ndkbuild/hello-jni/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/other-builds/ndkbuild/hello-jni/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/hello-jni/gradle/wrapper/gradle-wrapper.properties index bae2c2108..cf5ce97f5 100644 --- a/other-builds/ndkbuild/hello-jni/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/hello-jni/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/hello-libs/build.gradle b/other-builds/ndkbuild/hello-libs/build.gradle index 4dc1795ee..14d2ecd6a 100644 --- a/other-builds/ndkbuild/hello-libs/build.gradle +++ b/other-builds/ndkbuild/hello-libs/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/other-builds/ndkbuild/hello-libs/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/hello-libs/gradle/wrapper/gradle-wrapper.properties index ec432cacd..28cf7d23a 100644 --- a/other-builds/ndkbuild/hello-libs/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/hello-libs/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/hello-neon/build.gradle b/other-builds/ndkbuild/hello-neon/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/hello-neon/build.gradle +++ b/other-builds/ndkbuild/hello-neon/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/hello-neon/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/hello-neon/gradle/wrapper/gradle-wrapper.properties index bbe3a3b7a..180316600 100644 --- a/other-builds/ndkbuild/hello-neon/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/hello-neon/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/native-activity/build.gradle b/other-builds/ndkbuild/native-activity/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/native-activity/build.gradle +++ b/other-builds/ndkbuild/native-activity/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/native-activity/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/native-activity/gradle/wrapper/gradle-wrapper.properties index f654648c3..76d2c5045 100644 --- a/other-builds/ndkbuild/native-activity/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/native-activity/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/native-audio/build.gradle b/other-builds/ndkbuild/native-audio/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/native-audio/build.gradle +++ b/other-builds/ndkbuild/native-audio/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/native-audio/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/native-audio/gradle/wrapper/gradle-wrapper.properties index 50e2f8e14..623fd7c84 100644 --- a/other-builds/ndkbuild/native-audio/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/native-audio/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/native-codec/build.gradle b/other-builds/ndkbuild/native-codec/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/native-codec/build.gradle +++ b/other-builds/ndkbuild/native-codec/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/native-codec/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/native-codec/gradle/wrapper/gradle-wrapper.properties index 766a186a0..b57cbcc87 100644 --- a/other-builds/ndkbuild/native-codec/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/native-codec/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/native-media/build.gradle b/other-builds/ndkbuild/native-media/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/native-media/build.gradle +++ b/other-builds/ndkbuild/native-media/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/native-media/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/native-media/gradle/wrapper/gradle-wrapper.properties index de4de9ac6..67cd0d085 100644 --- a/other-builds/ndkbuild/native-media/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/native-media/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/native-plasma/build.gradle b/other-builds/ndkbuild/native-plasma/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/native-plasma/build.gradle +++ b/other-builds/ndkbuild/native-plasma/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/native-plasma/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/native-plasma/gradle/wrapper/gradle-wrapper.properties index a15f6d040..e2bcc9bd1 100644 --- a/other-builds/ndkbuild/native-plasma/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/native-plasma/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/nn-samples/build.gradle b/other-builds/ndkbuild/nn-samples/build.gradle index 1b9fe505a..4f1f3717a 100644 --- a/other-builds/ndkbuild/nn-samples/build.gradle +++ b/other-builds/ndkbuild/nn-samples/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/other-builds/ndkbuild/nn-samples/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/nn-samples/gradle/wrapper/gradle-wrapper.properties index 1b16c34a7..1f3fdbc52 100644 --- a/other-builds/ndkbuild/nn-samples/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/nn-samples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/other-builds/ndkbuild/san-angeles/build.gradle b/other-builds/ndkbuild/san-angeles/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/san-angeles/build.gradle +++ b/other-builds/ndkbuild/san-angeles/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/san-angeles/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/san-angeles/gradle/wrapper/gradle-wrapper.properties index b014e0939..0b4906f94 100644 --- a/other-builds/ndkbuild/san-angeles/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/san-angeles/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/teapots/build.gradle b/other-builds/ndkbuild/teapots/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/teapots/build.gradle +++ b/other-builds/ndkbuild/teapots/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/teapots/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/teapots/gradle/wrapper/gradle-wrapper.properties index edac9b807..da3febdf7 100644 --- a/other-builds/ndkbuild/teapots/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/teapots/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/other-builds/ndkbuild/two-libs/build.gradle b/other-builds/ndkbuild/two-libs/build.gradle index c28ec21af..d27683470 100644 --- a/other-builds/ndkbuild/two-libs/build.gradle +++ b/other-builds/ndkbuild/two-libs/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/other-builds/ndkbuild/two-libs/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/two-libs/gradle/wrapper/gradle-wrapper.properties index d3e86b323..eb3c8c548 100644 --- a/other-builds/ndkbuild/two-libs/gradle/wrapper/gradle-wrapper.properties +++ b/other-builds/ndkbuild/two-libs/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/prefab/curl-ssl/app/build.gradle b/prefab/curl-ssl/app/build.gradle index a0a8b53de..e436f449a 100644 --- a/prefab/curl-ssl/app/build.gradle +++ b/prefab/curl-ssl/app/build.gradle @@ -57,6 +57,7 @@ android { } } } + buildFeatures.prefab = true } dependencies { diff --git a/prefab/curl-ssl/build.gradle b/prefab/curl-ssl/build.gradle index 0e77c7153..2bbe1a06c 100644 --- a/prefab/curl-ssl/build.gradle +++ b/prefab/curl-ssl/build.gradle @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/prefab/curl-ssl/gradle.properties b/prefab/curl-ssl/gradle.properties index 69631051d..d8fe27be0 100644 --- a/prefab/curl-ssl/gradle.properties +++ b/prefab/curl-ssl/gradle.properties @@ -20,5 +20,3 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -# Enable importing Prefab dependencies -android.enablePrefab=true diff --git a/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties b/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties index 5da589f90..4b79d727e 100644 --- a/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties +++ b/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/prefab/prefab-dependency/app/build.gradle b/prefab/prefab-dependency/app/build.gradle index 366e97de9..889b69af1 100644 --- a/prefab/prefab-dependency/app/build.gradle +++ b/prefab/prefab-dependency/app/build.gradle @@ -22,6 +22,9 @@ plugins { android { compileSdkVersion 30 + + buildFeatures.prefab = true + defaultConfig { applicationId "com.example.com.example.prefabdependency" minSdkVersion 21 diff --git a/prefab/prefab-dependency/build.gradle b/prefab/prefab-dependency/build.gradle index 267dc2e53..1d863fd49 100644 --- a/prefab/prefab-dependency/build.gradle +++ b/prefab/prefab-dependency/build.gradle @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/prefab/prefab-dependency/gradle.properties b/prefab/prefab-dependency/gradle.properties index 1b0019862..e435cd21f 100644 --- a/prefab/prefab-dependency/gradle.properties +++ b/prefab/prefab-dependency/gradle.properties @@ -19,7 +19,7 @@ android.useAndroidX=true android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official -android.enablePrefab=true + # AGP 4.0.0-alpha09 defaulted to prefab 1.0.0-alpha3, which has issues on # Windows. # https://github.com/google/prefab/pull/47 diff --git a/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties b/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties index 5da589f90..4b79d727e 100644 --- a/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties +++ b/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/prefab/prefab-publishing/build.gradle b/prefab/prefab-publishing/build.gradle index cdae4cf8f..da1b407a0 100644 --- a/prefab/prefab-publishing/build.gradle +++ b/prefab/prefab-publishing/build.gradle @@ -20,7 +20,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.0-alpha12' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties index be3e48fb9..99dfb650d 100644 --- a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties +++ b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/san-angeles/app/build.gradle b/san-angeles/app/build.gradle index f28da5109..cf419c587 100644 --- a/san-angeles/app/build.gradle +++ b/san-angeles/app/build.gradle @@ -25,7 +25,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/san-angeles/build.gradle b/san-angeles/build.gradle index fc82e6802..b16ce11ac 100644 --- a/san-angeles/build.gradle +++ b/san-angeles/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/san-angeles/gradle/wrapper/gradle-wrapper.properties b/san-angeles/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/san-angeles/gradle/wrapper/gradle-wrapper.properties +++ b/san-angeles/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sensor-graph/accelerometer/build.gradle b/sensor-graph/accelerometer/build.gradle index f2471ef12..934e01437 100644 --- a/sensor-graph/accelerometer/build.gradle +++ b/sensor-graph/accelerometer/build.gradle @@ -23,7 +23,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/sensor-graph/build.gradle b/sensor-graph/build.gradle index fc82e6802..b16ce11ac 100644 --- a/sensor-graph/build.gradle +++ b/sensor-graph/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/sensor-graph/gradle/wrapper/gradle-wrapper.properties b/sensor-graph/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/sensor-graph/gradle/wrapper/gradle-wrapper.properties +++ b/sensor-graph/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/teapots/build.gradle b/teapots/build.gradle index fc82e6802..b16ce11ac 100755 --- a/teapots/build.gradle +++ b/teapots/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/teapots/choreographer-30fps/build.gradle b/teapots/choreographer-30fps/build.gradle index 535709c14..7f71fa520 100644 --- a/teapots/choreographer-30fps/build.gradle +++ b/teapots/choreographer-30fps/build.gradle @@ -28,7 +28,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/teapots/classic-teapot/build.gradle b/teapots/classic-teapot/build.gradle index f6198c1c2..e66032ac5 100644 --- a/teapots/classic-teapot/build.gradle +++ b/teapots/classic-teapot/build.gradle @@ -28,7 +28,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/teapots/gradle/wrapper/gradle-wrapper.properties b/teapots/gradle/wrapper/gradle-wrapper.properties index 371a51a2b..660486abb 100644 --- a/teapots/gradle/wrapper/gradle-wrapper.properties +++ b/teapots/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/teapots/image-decoder/build.gradle b/teapots/image-decoder/build.gradle index c22d14234..3d9d95547 100644 --- a/teapots/image-decoder/build.gradle +++ b/teapots/image-decoder/build.gradle @@ -28,7 +28,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/teapots/more-teapots/build.gradle b/teapots/more-teapots/build.gradle index c65a7c76a..5067a5d39 100644 --- a/teapots/more-teapots/build.gradle +++ b/teapots/more-teapots/build.gradle @@ -29,7 +29,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/teapots/textured-teapot/build.gradle b/teapots/textured-teapot/build.gradle index 05146f1f1..7f6ea67e9 100644 --- a/teapots/textured-teapot/build.gradle +++ b/teapots/textured-teapot/build.gradle @@ -28,7 +28,7 @@ android { } externalNativeBuild { cmake { - version '3.10.2' + version '3.18.1' path 'src/main/cpp/CMakeLists.txt' } } diff --git a/webp/build.gradle b/webp/build.gradle index fc82e6802..b16ce11ac 100644 --- a/webp/build.gradle +++ b/webp/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:4.2.0' } } diff --git a/webp/gradle/wrapper/gradle-wrapper.properties b/webp/gradle/wrapper/gradle-wrapper.properties index 4e1cc9db6..1f3fdbc52 100644 --- a/webp/gradle/wrapper/gradle-wrapper.properties +++ b/webp/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists