From a444baf7b469c96ddbb711f89c4d28f4fe1d561d Mon Sep 17 00:00:00 2001 From: James Farrell Date: Thu, 17 Nov 2022 17:15:30 -0600 Subject: [PATCH 1/2] Upate gradle files to reflect current app templates. settings.gradle: * Add pluginManagement and dependencyResolutionManagement stanzas. build.gradle: * Remove declaration of repositories and dependencies, since this goes in settings.gradle * Use Kotlin version 1.7.10 * Use AGP version 7.3.0 app/build.gradle: * Use `plugins { id 'foo' }` instead `apply plugin: 'foo'` * Compile all samples with the latest version of the SDK (33) and NDK (25.1.8937393). * Remove kotlin-android-extensions Furthermore: * In CI build script, make detection of debug mode work on MacOS. * Uncomment webp in CI build script. * Add missing projects to CI build script (display-p3, hello-oboe, native-midi, prefab/prefab-dependency) * Update gradle version to 7.4 * Update hello-oboe and prefab-dependency to use view binding. * Update native-midi to eliminate compiler warning. --- .ci_tools/build_samples.sh | 16 ++++++++--- .ci_tools/setup_env.sh | 2 +- audio-echo/app/build.gradle | 8 +++--- audio-echo/build.gradle | 25 +++++------------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- audio-echo/settings.gradle | 14 ++++++++++ bitmap-plasma/app/build.gradle | 8 +++--- bitmap-plasma/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- bitmap-plasma/settings.gradle | 14 ++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- camera/basic/build.gradle | 8 +++--- camera/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- camera/settings.gradle | 14 ++++++++++ camera/texture-view/build.gradle | 8 +++--- display-p3/build.gradle | 21 ++++----------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- display-p3/image-view/build.gradle | 8 +++--- display-p3/settings.gradle | 14 ++++++++++ endless-tunnel/app/build.gradle | 8 +++--- endless-tunnel/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- endless-tunnel/settings.gradle | 14 ++++++++++ gles3jni/app/build.gradle | 8 +++--- gles3jni/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gles3jni/settings.gradle | 14 ++++++++++ hello-gl2/app/build.gradle | 8 +++--- hello-gl2/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- hello-gl2/settings.gradle | 14 ++++++++++ hello-jni/app/build.gradle | 13 ++++----- hello-jni/build.gradle | 27 ++++--------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- hello-jni/settings.gradle | 14 ++++++++++ hello-jniCallback/app/build.gradle | 8 +++--- hello-jniCallback/build.gradle | 25 ++++------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- hello-jniCallback/settings.gradle | 14 ++++++++++ hello-libs/app/build.gradle | 8 +++--- hello-libs/build.gradle | 25 ++++------------- hello-libs/gen-libs/build.gradle | 8 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- hello-libs/settings.gradle | 14 ++++++++++ hello-neon/app/build.gradle | 8 +++--- hello-neon/build.gradle | 25 ++++------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- hello-neon/settings.gradle | 14 ++++++++++ hello-oboe/app/build.gradle | 20 +++++++------- .../google/example/hellooboe/MainActivity.kt | 10 ++++--- hello-oboe/build.gradle | 27 ++++--------------- .../gradle/wrapper/gradle-wrapper.properties | 5 ++-- hello-oboe/settings.gradle | 14 ++++++++++ native-activity/app/build.gradle | 8 +++--- native-activity/build.gradle | 21 ++++----------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- native-activity/settings.gradle | 14 ++++++++++ native-audio/app/build.gradle | 10 ++++--- native-audio/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- native-audio/settings.gradle | 14 ++++++++++ native-codec/app/build.gradle | 8 +++--- native-codec/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- native-codec/settings.gradle | 14 ++++++++++ native-media/app/build.gradle | 8 +++--- native-media/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- native-media/settings.gradle | 14 ++++++++++ native-midi/app/build.gradle | 8 +++--- .../app/src/main/cpp/AppMidiManager.cpp | 10 +++---- native-midi/build.gradle | 27 ++++--------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- native-midi/settings.gradle | 14 ++++++++++ native-plasma/app/build.gradle | 8 +++--- native-plasma/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- native-plasma/settings.gradle | 14 ++++++++++ nn-samples/basic/build.gradle | 16 +++++------ nn-samples/build.gradle | 27 ++++--------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- nn-samples/sequence/build.gradle | 8 +++--- nn-samples/settings.gradle | 14 ++++++++++ .../ndkbuild/bitmap-plasma/app/build.gradle | 8 +++--- .../ndkbuild/bitmap-plasma/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/bitmap-plasma/settings.gradle | 14 ++++++++++ .../ndkbuild/gles3jni/app/build.gradle | 8 +++--- other-builds/ndkbuild/gles3jni/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/gles3jni/settings.gradle | 14 ++++++++++ .../ndkbuild/hello-gl2/app/build.gradle | 9 ++++--- other-builds/ndkbuild/hello-gl2/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/hello-gl2/settings.gradle | 14 ++++++++++ .../ndkbuild/hello-jni/app/build.gradle | 13 ++++----- other-builds/ndkbuild/hello-jni/build.gradle | 24 +++++------------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/hello-jni/settings.gradle | 14 ++++++++++ .../ndkbuild/hello-libs/app/build.gradle | 8 +++--- other-builds/ndkbuild/hello-libs/build.gradle | 25 ++++------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/hello-libs/settings.gradle | 14 ++++++++++ .../ndkbuild/hello-neon/app/build.gradle | 9 ++++--- other-builds/ndkbuild/hello-neon/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/hello-neon/settings.gradle | 14 ++++++++++ .../ndkbuild/native-activity/app/build.gradle | 8 +++--- .../ndkbuild/native-activity/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/native-activity/settings.gradle | 14 ++++++++++ .../ndkbuild/native-audio/app/build.gradle | 11 +++++--- .../ndkbuild/native-audio/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/native-audio/settings.gradle | 14 ++++++++++ .../ndkbuild/native-codec/app/build.gradle | 8 +++--- .../ndkbuild/native-codec/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/native-codec/settings.gradle | 14 ++++++++++ .../ndkbuild/native-media/app/build.gradle | 9 ++++--- .../ndkbuild/native-media/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/native-media/settings.gradle | 14 ++++++++++ .../ndkbuild/native-plasma/app/build.gradle | 8 +++--- .../ndkbuild/native-plasma/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/native-plasma/settings.gradle | 14 ++++++++++ .../ndkbuild/nn-samples/basic/build.gradle | 13 ++++----- other-builds/ndkbuild/nn-samples/build.gradle | 23 +++++----------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/nn-samples/settings.gradle | 14 ++++++++++ .../ndkbuild/san-angeles/app/build.gradle | 8 +++--- .../ndkbuild/san-angeles/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/san-angeles/settings.gradle | 14 ++++++++++ other-builds/ndkbuild/teapots/build.gradle | 21 +++++---------- .../teapots/classic-teapot/build.gradle | 8 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../teapots/more-teapots/build.gradle | 8 +++--- other-builds/ndkbuild/teapots/settings.gradle | 14 ++++++++++ .../ndkbuild/two-libs/app/build.gradle | 8 +++--- other-builds/ndkbuild/two-libs/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../ndkbuild/two-libs/settings.gradle | 14 ++++++++++ prefab/curl-ssl/app/build.gradle | 9 +++---- prefab/curl-ssl/build.gradle | 24 +++++------------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- prefab/curl-ssl/settings.gradle | 14 ++++++++++ prefab/prefab-dependency/app/build.gradle | 14 +++++----- .../example/prefabdependency/MainActivity.kt | 14 +++++----- prefab/prefab-dependency/build.gradle | 24 +++++------------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- prefab/prefab-dependency/settings.gradle | 14 ++++++++++ prefab/prefab-publishing/build.gradle | 22 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../prefab-publishing/mylibrary/build.gradle | 4 +-- prefab/prefab-publishing/settings.gradle | 14 ++++++++++ san-angeles/app/build.gradle | 8 +++--- san-angeles/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- san-angeles/settings.gradle | 14 ++++++++++ sensor-graph/accelerometer/build.gradle | 8 +++--- sensor-graph/build.gradle | 21 +++++---------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- sensor-graph/settings.gradle | 14 ++++++++++ teapots/build.gradle | 21 +++++---------- teapots/choreographer-30fps/build.gradle | 8 +++--- teapots/classic-teapot/build.gradle | 8 +++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- teapots/image-decoder/build.gradle | 8 +++--- teapots/more-teapots/build.gradle | 9 ++++--- teapots/settings.gradle | 14 ++++++++++ teapots/textured-teapot/build.gradle | 8 +++--- webp/build.gradle | 21 +++++---------- webp/gradle/wrapper/gradle-wrapper.properties | 2 +- webp/settings.gradle | 14 ++++++++++ webp/view/build.gradle | 8 +++--- 178 files changed, 1177 insertions(+), 892 deletions(-) diff --git a/.ci_tools/build_samples.sh b/.ci_tools/build_samples.sh index a96dabc48..97ba18b12 100755 --- a/.ci_tools/build_samples.sh +++ b/.ci_tools/build_samples.sh @@ -17,6 +17,7 @@ declare projects=( audio-echo bitmap-plasma camera + display-p3 endless-tunnel gles3jni hello-gl2 @@ -24,18 +25,21 @@ declare projects=( hello-jniCallback hello-libs hello-neon + hello-oboe native-activity native-audio native-codec native-media + native-midi native-plasma nn-samples prefab/curl-ssl + prefab/prefab-dependency prefab/prefab-publishing san-angeles sensor-graph -# webp teapots + webp ## ndk-build samples other-builds/ndkbuild/bitmap-plasma other-builds/ndkbuild/gles3jni @@ -54,13 +58,13 @@ declare projects=( ) VERBOSITY=--quiet -if [[ -v RUNNER_DEBUG ]] ; then +if [ -n "${RUNNER_DEBUG+1}" ] ; then VERBOSITY=--info fi for d in "${projects[@]}"; do pushd ${NDK_SAMPLE_REPO}/${d} >/dev/null echo "Building ${d}" - TERM=dumb ./gradlew ${VERBOSITY} clean assembleDebug + TERM=dumb ./gradlew ${VERBOSITY} assembleDebug popd >/dev/null done @@ -71,6 +75,7 @@ declare apks=( bitmap-plasma/app/build/outputs/apk/debug/app-debug.apk camera/basic/build/outputs/apk/debug/basic-debug.apk camera/texture-view/build/outputs/apk/debug/texture-view-debug.apk + display-p3/image-view/build/outputs/apk/debug/image-view-debug.apk endless-tunnel/app/build/outputs/apk/debug/app-debug.apk gles3jni/app/build/outputs/apk/debug/app-debug.apk hello-gl2/app/build/outputs/apk/debug/app-debug.apk @@ -78,15 +83,18 @@ declare apks=( hello-jniCallback/app/build/outputs/apk/debug/app-debug.apk hello-libs/app/build/outputs/apk/debug/app-debug.apk hello-neon/app/build/outputs/apk/debug/app-debug.apk + hello-oboe/app/build/outputs/apk/debug/app-debug.apk native-activity/app/build/outputs/apk/debug/app-debug.apk native-audio/app/build/outputs/apk/debug/app-debug.apk native-codec/app/build/outputs/apk/debug/app-debug.apk native-media/app/build/outputs/apk/debug/app-debug.apk + native-midi/app/build/outputs/apk/debug/app-debug.apk native-plasma/app/build/outputs/apk/debug/app-debug.apk nn-samples/basic/build/outputs/apk/debug/basic-debug.apk nn-samples/sequence/build/outputs/apk/debug/sequence-debug.apk prefab/curl-ssl/app/build/outputs/apk/debug/app-debug.apk prefab/prefab-publishing/mylibrary/build/outputs/aar/mylibrary-debug.aar + prefab/prefab-dependency/app/build/outputs/apk/debug/app-debug.apk sensor-graph/accelerometer/build/outputs/apk/debug/accelerometer-debug.apk san-angeles/app/build/outputs/apk/debug/app-armeabi-v7a-debug.apk san-angeles/app/build/outputs/apk/debug/app-arm64-v8a-debug.apk @@ -95,7 +103,7 @@ declare apks=( teapots/more-teapots/build/outputs/apk/debug/more-teapots-debug.apk teapots/choreographer-30fps/build/outputs/apk/debug/choreographer-30fps-debug.apk teapots/image-decoder/build/outputs/apk/debug/image-decoder-debug.apk -# webp/view/build/outputs/apk/debug/view-arm7-debug.apk + webp/view/build/outputs/apk/debug/view-debug.apk ## other-builds other-builds/ndkbuild/bitmap-plasma/app/build/outputs/apk/debug/app-debug.apk diff --git a/.ci_tools/setup_env.sh b/.ci_tools/setup_env.sh index a650da8f3..7d77957fa 100755 --- a/.ci_tools/setup_env.sh +++ b/.ci_tools/setup_env.sh @@ -76,7 +76,7 @@ fi TMP_SETUP_FILENAME=versions_.txt ## Retrieve all necessary Android Platforms and install them all -retrieve_versions compileSdkVersion $TMP_SETUP_FILENAME +retrieve_versions compileSdk $TMP_SETUP_FILENAME # Install platforms while read -r version_; do diff --git a/audio-echo/app/build.gradle b/audio-echo/app/build.gradle index dd0872bca..066f5650b 100644 --- a/audio-echo/app/build.gradle +++ b/audio-echo/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.google.sample.echo' diff --git a/audio-echo/build.gradle b/audio-echo/build.gradle index adf7dfd2b..9823be4b1 100644 --- a/audio-echo/build.gradle +++ b/audio-echo/build.gradle @@ -1,21 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/audio-echo/gradle/wrapper/gradle-wrapper.properties b/audio-echo/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/audio-echo/settings.gradle b/audio-echo/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/audio-echo/settings.gradle +++ b/audio-echo/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/bitmap-plasma/app/build.gradle b/bitmap-plasma/app/build.gradle index 5d9d8c7cf..28fa81d52 100644 --- a/bitmap-plasma/app/build.gradle +++ b/bitmap-plasma/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig.with { applicationId 'com.example.plasma' diff --git a/bitmap-plasma/build.gradle b/bitmap-plasma/build.gradle index b9d2ec831..9823be4b1 100644 --- a/bitmap-plasma/build.gradle +++ b/bitmap-plasma/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties b/bitmap-plasma/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/bitmap-plasma/settings.gradle b/bitmap-plasma/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/bitmap-plasma/settings.gradle +++ b/bitmap-plasma/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/builder/gradle/wrapper/gradle-wrapper.properties b/builder/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/camera/basic/build.gradle b/camera/basic/build.gradle index 9ee22a0d0..f56838959 100644 --- a/camera/basic/build.gradle +++ b/camera/basic/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.sample.camera.basic' diff --git a/camera/build.gradle b/camera/build.gradle index b9d2ec831..9823be4b1 100644 --- a/camera/build.gradle +++ b/camera/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/camera/gradle/wrapper/gradle-wrapper.properties b/camera/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/camera/settings.gradle b/camera/settings.gradle index 81f4946d4..bc31040b6 100644 --- a/camera/settings.gradle +++ b/camera/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':basic' include ':texture-view' diff --git a/camera/texture-view/build.gradle b/camera/texture-view/build.gradle index f0a79d280..f89ec5204 100644 --- a/camera/texture-view/build.gradle +++ b/camera/texture-view/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.sample.textureview" diff --git a/display-p3/build.gradle b/display-p3/build.gradle index 648fe4fa7..9823be4b1 100644 --- a/display-p3/build.gradle +++ b/display-p3/build.gradle @@ -1,21 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/display-p3/gradle/wrapper/gradle-wrapper.properties b/display-p3/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-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 dbd73d34b..e2b7a8eba 100644 --- a/display-p3/image-view/build.gradle +++ b/display-p3/image-view/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.example.widecolor' diff --git a/display-p3/settings.gradle b/display-p3/settings.gradle index eb4d6e5f7..a34059356 100644 --- a/display-p3/settings.gradle +++ b/display-p3/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':image-view' diff --git a/endless-tunnel/app/build.gradle b/endless-tunnel/app/build.gradle index 2ce33aa24..2fa38a3e0 100644 --- a/endless-tunnel/app/build.gradle +++ b/endless-tunnel/app/build.gradle @@ -14,11 +14,13 @@ * limitations under the License. */ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.google.sample.tunnel' diff --git a/endless-tunnel/build.gradle b/endless-tunnel/build.gradle index b9d2ec831..9823be4b1 100644 --- a/endless-tunnel/build.gradle +++ b/endless-tunnel/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/endless-tunnel/gradle/wrapper/gradle-wrapper.properties b/endless-tunnel/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/endless-tunnel/settings.gradle b/endless-tunnel/settings.gradle index 5496292de..2a31c8f9e 100644 --- a/endless-tunnel/settings.gradle +++ b/endless-tunnel/settings.gradle @@ -14,4 +14,18 @@ * limitations under the License. */ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/gles3jni/app/build.gradle b/gles3jni/app/build.gradle index c75533c14..4f2320714 100644 --- a/gles3jni/app/build.gradle +++ b/gles3jni/app/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} def platformVersion = 24 // openGLES 3.2 min api level // def platformVersion = 18 //openGLES 3 min api level // def platformVersion = 12 //openGLES 2 min api level android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.android.gles3jni' diff --git a/gles3jni/build.gradle b/gles3jni/build.gradle index b9d2ec831..9823be4b1 100644 --- a/gles3jni/build.gradle +++ b/gles3jni/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/gles3jni/gradle/wrapper/gradle-wrapper.properties b/gles3jni/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gles3jni/settings.gradle b/gles3jni/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/gles3jni/settings.gradle +++ b/gles3jni/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/hello-gl2/app/build.gradle b/hello-gl2/app/build.gradle index 0db2c916d..568b9d1b3 100644 --- a/hello-gl2/app/build.gradle +++ b/hello-gl2/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.android.gl2jni' diff --git a/hello-gl2/build.gradle b/hello-gl2/build.gradle index b9d2ec831..9823be4b1 100644 --- a/hello-gl2/build.gradle +++ b/hello-gl2/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/hello-gl2/gradle/wrapper/gradle-wrapper.properties b/hello-gl2/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-gl2/settings.gradle b/hello-gl2/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/hello-gl2/settings.gradle +++ b/hello-gl2/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/hello-jni/app/build.gradle b/hello-jni/app/build.gradle index 8e9c10075..7638ddd1e 100644 --- a/hello-jni/app/build.gradle +++ b/hello-jni/app/build.gradle @@ -1,10 +1,11 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.hellojni' @@ -54,5 +55,5 @@ android { dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" } diff --git a/hello-jni/build.gradle b/hello-jni/build.gradle index 013282213..9823be4b1 100644 --- a/hello-jni/build.gradle +++ b/hello-jni/build.gradle @@ -1,27 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.3.72' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - 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 - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/hello-jni/gradle/wrapper/gradle-wrapper.properties b/hello-jni/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-jni/settings.gradle b/hello-jni/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/hello-jni/settings.gradle +++ b/hello-jni/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/hello-jniCallback/app/build.gradle b/hello-jniCallback/app/build.gradle index 61b437e4e..94a9654d8 100644 --- a/hello-jniCallback/app/build.gradle +++ b/hello-jniCallback/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.hellojnicallback' diff --git a/hello-jniCallback/build.gradle b/hello-jniCallback/build.gradle index 77ffc4211..9823be4b1 100644 --- a/hello-jniCallback/build.gradle +++ b/hello-jniCallback/build.gradle @@ -1,25 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties b/hello-jniCallback/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-jniCallback/settings.gradle b/hello-jniCallback/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/hello-jniCallback/settings.gradle +++ b/hello-jniCallback/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/hello-libs/app/build.gradle b/hello-libs/app/build.gradle index 6d845a2a1..8ec475b90 100644 --- a/hello-libs/app/build.gradle +++ b/hello-libs/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.example.hellolibs' diff --git a/hello-libs/build.gradle b/hello-libs/build.gradle index 77ffc4211..9823be4b1 100644 --- a/hello-libs/build.gradle +++ b/hello-libs/build.gradle @@ -1,25 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/hello-libs/gen-libs/build.gradle b/hello-libs/gen-libs/build.gradle index fa46d9c3b..3e23af7aa 100644 --- a/hello-libs/gen-libs/build.gradle +++ b/hello-libs/gen-libs/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { minSdkVersion 14 diff --git a/hello-libs/gradle/wrapper/gradle-wrapper.properties b/hello-libs/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-libs/settings.gradle b/hello-libs/settings.gradle index e04d00da3..b069fd6bc 100644 --- a/hello-libs/settings.gradle +++ b/hello-libs/settings.gradle @@ -1,3 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' // To generate libs used in this sample: diff --git a/hello-neon/app/build.gradle b/hello-neon/app/build.gradle index c5a738729..c6deb7535 100644 --- a/hello-neon/app/build.gradle +++ b/hello-neon/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.helloneon" diff --git a/hello-neon/build.gradle b/hello-neon/build.gradle index 77ffc4211..9823be4b1 100644 --- a/hello-neon/build.gradle +++ b/hello-neon/build.gradle @@ -1,25 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/hello-neon/gradle/wrapper/gradle-wrapper.properties b/hello-neon/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/hello-neon/settings.gradle b/hello-neon/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/hello-neon/settings.gradle +++ b/hello-neon/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/hello-oboe/app/build.gradle b/hello-oboe/app/build.gradle index d27077554..d71a1f399 100644 --- a/hello-oboe/app/build.gradle +++ b/hello-oboe/app/build.gradle @@ -1,12 +1,11 @@ -apply plugin: 'com.android.application' - -apply plugin: 'kotlin-android' - -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.google.example.hellooboe" @@ -30,13 +29,16 @@ android { version "3.18.1" } } - buildFeatures.prefab = true + buildFeatures { + prefab = true + viewBinding = true + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) // Kotlin - implementation"org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + implementation"org.jetbrains.kotlin:kotlin-stdlib:1.7.10" // AndroidX implementation 'androidx.appcompat:appcompat:1.1.0' diff --git a/hello-oboe/app/src/main/java/com/google/example/hellooboe/MainActivity.kt b/hello-oboe/app/src/main/java/com/google/example/hellooboe/MainActivity.kt index 770d004f7..a64874f66 100644 --- a/hello-oboe/app/src/main/java/com/google/example/hellooboe/MainActivity.kt +++ b/hello-oboe/app/src/main/java/com/google/example/hellooboe/MainActivity.kt @@ -22,13 +22,17 @@ import android.os.Bundle import android.view.MotionEvent import android.view.View import android.widget.Toast -import kotlinx.android.synthetic.main.activity_main.sample_text +import com.google.example.hellooboe.databinding.ActivityMainBinding class MainActivity : AppCompatActivity() { + private lateinit var binding: ActivityMainBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) + binding = ActivityMainBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) } /* @@ -50,7 +54,7 @@ class MainActivity : AppCompatActivity() { if (createStream() != 0) { val errorString : String = getString(R.string.error_msg) Toast.makeText(applicationContext, errorString,Toast.LENGTH_LONG).show() - sample_text.text = errorString + binding.sampleText.text = errorString } } diff --git a/hello-oboe/build.gradle b/hello-oboe/build.gradle index 95f7347c3..9823be4b1 100644 --- a/hello-oboe/build.gradle +++ b/hello-oboe/build.gradle @@ -1,27 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.3.72' - repositories { - google() - mavenCentral() - - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - 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 - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/hello-oboe/gradle/wrapper/gradle-wrapper.properties b/hello-oboe/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..3b0803f86 100644 --- a/hello-oboe/gradle/wrapper/gradle-wrapper.properties +++ b/hello-oboe/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Thu Nov 17 16:35:15 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/hello-oboe/settings.gradle b/hello-oboe/settings.gradle index c908a1fdd..4d158c4a6 100644 --- a/hello-oboe/settings.gradle +++ b/hello-oboe/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' rootProject.name='Hello Oboe' diff --git a/native-activity/app/build.gradle b/native-activity/app/build.gradle index e6f35833c..f1a2e3d95 100644 --- a/native-activity/app/build.gradle +++ b/native-activity/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.example.native_activity' diff --git a/native-activity/build.gradle b/native-activity/build.gradle index 648fe4fa7..9823be4b1 100644 --- a/native-activity/build.gradle +++ b/native-activity/build.gradle @@ -1,21 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/native-activity/gradle/wrapper/gradle-wrapper.properties b/native-activity/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-activity/settings.gradle b/native-activity/settings.gradle index 573abcb32..d7edd622e 100644 --- a/native-activity/settings.gradle +++ b/native-activity/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/native-audio/app/build.gradle b/native-audio/app/build.gradle index a23599b9e..bdf3110e7 100644 --- a/native-audio/app/build.gradle +++ b/native-audio/app/build.gradle @@ -1,10 +1,12 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' - defaultConfig { + defaultConfig { applicationId 'com.example.nativeaudio' minSdkVersion 23 targetSdkVersion 28 diff --git a/native-audio/build.gradle b/native-audio/build.gradle index b9d2ec831..9823be4b1 100644 --- a/native-audio/build.gradle +++ b/native-audio/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/native-audio/gradle/wrapper/gradle-wrapper.properties b/native-audio/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-audio/settings.gradle b/native-audio/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/native-audio/settings.gradle +++ b/native-audio/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/native-codec/app/build.gradle b/native-codec/app/build.gradle index 4537d34a3..9e7afa053 100644 --- a/native-codec/app/build.gradle +++ b/native-codec/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.nativecodec' diff --git a/native-codec/build.gradle b/native-codec/build.gradle index b9d2ec831..9823be4b1 100644 --- a/native-codec/build.gradle +++ b/native-codec/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/native-codec/gradle/wrapper/gradle-wrapper.properties b/native-codec/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-codec/settings.gradle b/native-codec/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/native-codec/settings.gradle +++ b/native-codec/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/native-media/app/build.gradle b/native-media/app/build.gradle index a753db8fc..82a36abe9 100644 --- a/native-media/app/build.gradle +++ b/native-media/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.nativemedia' diff --git a/native-media/build.gradle b/native-media/build.gradle index b9d2ec831..9823be4b1 100644 --- a/native-media/build.gradle +++ b/native-media/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/native-media/gradle/wrapper/gradle-wrapper.properties b/native-media/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-media/settings.gradle b/native-media/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/native-media/settings.gradle +++ b/native-media/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/native-midi/app/build.gradle b/native-midi/app/build.gradle index db3408029..f825365d5 100644 --- a/native-midi/app/build.gradle +++ b/native-midi/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.nativemidi" diff --git a/native-midi/app/src/main/cpp/AppMidiManager.cpp b/native-midi/app/src/main/cpp/AppMidiManager.cpp index 64bac05de..852ddc587 100644 --- a/native-midi/app/src/main/cpp/AppMidiManager.cpp +++ b/native-midi/app/src/main/cpp/AppMidiManager.cpp @@ -148,13 +148,12 @@ extern "C" { void Java_com_example_nativemidi_AppMidiManager_startReadingMidi( JNIEnv* env, jobject, jobject midiDeviceObj, jint portNumber) { - media_status_t status; - status = AMidiDevice_fromJava(env, midiDeviceObj, &sNativeReceiveDevice); + AMidiDevice_fromJava(env, midiDeviceObj, &sNativeReceiveDevice); // int32_t deviceType = AMidiDevice_getType(sNativeReceiveDevice); // ssize_t numPorts = AMidiDevice_getNumOutputPorts(sNativeReceiveDevice); AMidiOutputPort *outputPort; - status = AMidiOutputPort_open(sNativeReceiveDevice, portNumber, &outputPort); + AMidiOutputPort_open(sNativeReceiveDevice, portNumber, &outputPort); // sMidiOutputPort.store(outputPort); sMidiOutputPort = outputPort; @@ -192,13 +191,12 @@ void Java_com_example_nativemidi_AppMidiManager_stopReadingMidi(JNIEnv*, jobject void Java_com_example_nativemidi_AppMidiManager_startWritingMidi( JNIEnv* env, jobject, jobject midiDeviceObj, jint portNumber) { - media_status_t status; - status = AMidiDevice_fromJava(env, midiDeviceObj, &sNativeSendDevice); + AMidiDevice_fromJava(env, midiDeviceObj, &sNativeSendDevice); // int32_t deviceType = AMidiDevice_getType(sNativeReceiveDevice); // ssize_t numPorts = AMidiDevice_getNumInputPorts(sNativeSendDevice); AMidiInputPort *inputPort; - status = AMidiInputPort_open(sNativeSendDevice, portNumber, &inputPort); + AMidiInputPort_open(sNativeSendDevice, portNumber, &inputPort); // sMidiInputPort.store(inputPort); sMidiInputPort = inputPort; } diff --git a/native-midi/build.gradle b/native-midi/build.gradle index c1b520fb0..9823be4b1 100644 --- a/native-midi/build.gradle +++ b/native-midi/build.gradle @@ -1,27 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - mavenCentral() - - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/native-midi/gradle/wrapper/gradle-wrapper.properties b/native-midi/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-midi/settings.gradle b/native-midi/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/native-midi/settings.gradle +++ b/native-midi/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/native-plasma/app/build.gradle b/native-plasma/app/build.gradle index e1f56a740..93d1f9d71 100644 --- a/native-plasma/app/build.gradle +++ b/native-plasma/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.native_plasma' diff --git a/native-plasma/build.gradle b/native-plasma/build.gradle index b9d2ec831..9823be4b1 100644 --- a/native-plasma/build.gradle +++ b/native-plasma/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/native-plasma/gradle/wrapper/gradle-wrapper.properties b/native-plasma/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/native-plasma/settings.gradle b/native-plasma/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/native-plasma/settings.gradle +++ b/native-plasma/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/nn-samples/basic/build.gradle b/nn-samples/basic/build.gradle index f7d795fca..2f1a63518 100644 --- a/nn-samples/basic/build.gradle +++ b/nn-samples/basic/build.gradle @@ -1,10 +1,11 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.android.basic" @@ -42,10 +43,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0" } -repositories { - mavenCentral() -} diff --git a/nn-samples/build.gradle b/nn-samples/build.gradle index 013282213..9823be4b1 100644 --- a/nn-samples/build.gradle +++ b/nn-samples/build.gradle @@ -1,27 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - ext.kotlin_version = '1.3.72' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - 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 - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/nn-samples/gradle/wrapper/gradle-wrapper.properties b/nn-samples/gradle/wrapper/gradle-wrapper.properties index 68fb3b612..80e80ce91 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/nn-samples/sequence/build.gradle b/nn-samples/sequence/build.gradle index d410e7530..f1f7f03dd 100644 --- a/nn-samples/sequence/build.gradle +++ b/nn-samples/sequence/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.android.sequence" diff --git a/nn-samples/settings.gradle b/nn-samples/settings.gradle index 435973e5b..071239f78 100644 --- a/nn-samples/settings.gradle +++ b/nn-samples/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':basic', ':sequence' diff --git a/other-builds/ndkbuild/bitmap-plasma/app/build.gradle b/other-builds/ndkbuild/bitmap-plasma/app/build.gradle index d45041f38..7705a5cc4 100644 --- a/other-builds/ndkbuild/bitmap-plasma/app/build.gradle +++ b/other-builds/ndkbuild/bitmap-plasma/app/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_PROJ_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.plasma" diff --git a/other-builds/ndkbuild/bitmap-plasma/build.gradle b/other-builds/ndkbuild/bitmap-plasma/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/bitmap-plasma/build.gradle +++ b/other-builds/ndkbuild/bitmap-plasma/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 b58f45035..1f8edde8d 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/bitmap-plasma/settings.gradle b/other-builds/ndkbuild/bitmap-plasma/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/bitmap-plasma/settings.gradle +++ b/other-builds/ndkbuild/bitmap-plasma/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/gles3jni/app/build.gradle b/other-builds/ndkbuild/gles3jni/app/build.gradle index d9534d246..b1389d474 100644 --- a/other-builds/ndkbuild/gles3jni/app/build.gradle +++ b/other-builds/ndkbuild/gles3jni/app/build.gradle @@ -5,15 +5,17 @@ * command line argument APP_PLATFORM=android-11 (or lower) */ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.android.gles3jni' diff --git a/other-builds/ndkbuild/gles3jni/build.gradle b/other-builds/ndkbuild/gles3jni/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/gles3jni/build.gradle +++ b/other-builds/ndkbuild/gles3jni/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/other-builds/ndkbuild/gles3jni/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/gles3jni/gradle/wrapper/gradle-wrapper.properties index 72a35ed65..4baeb0557 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/gles3jni/settings.gradle b/other-builds/ndkbuild/gles3jni/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/gles3jni/settings.gradle +++ b/other-builds/ndkbuild/gles3jni/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/hello-gl2/app/build.gradle b/other-builds/ndkbuild/hello-gl2/app/build.gradle index 927d2e716..4e6292b40 100644 --- a/other-builds/ndkbuild/hello-gl2/app/build.gradle +++ b/other-builds/ndkbuild/hello-gl2/app/build.gradle @@ -1,11 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} + // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.android.gl2jni' diff --git a/other-builds/ndkbuild/hello-gl2/build.gradle b/other-builds/ndkbuild/hello-gl2/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/hello-gl2/build.gradle +++ b/other-builds/ndkbuild/hello-gl2/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 87ccfd483..c7ee3d913 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/hello-gl2/settings.gradle b/other-builds/ndkbuild/hello-gl2/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/hello-gl2/settings.gradle +++ b/other-builds/ndkbuild/hello-gl2/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/hello-jni/app/build.gradle b/other-builds/ndkbuild/hello-jni/app/build.gradle index 2e111463f..abc9decd6 100644 --- a/other-builds/ndkbuild/hello-jni/app/build.gradle +++ b/other-builds/ndkbuild/hello-jni/app/build.gradle @@ -1,13 +1,14 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} // pointing to cmake's source code for the same project def REMOTE_PROJ_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.hellojni" @@ -44,6 +45,6 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" } diff --git a/other-builds/ndkbuild/hello-jni/build.gradle b/other-builds/ndkbuild/hello-jni/build.gradle index b05ce60af..9823be4b1 100644 --- a/other-builds/ndkbuild/hello-jni/build.gradle +++ b/other-builds/ndkbuild/hello-jni/build.gradle @@ -1,20 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - ext.kotlin_version = '1.3.72' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 cdeeb19e6..d9c657e82 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/hello-jni/settings.gradle b/other-builds/ndkbuild/hello-jni/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/hello-jni/settings.gradle +++ b/other-builds/ndkbuild/hello-jni/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/hello-libs/app/build.gradle b/other-builds/ndkbuild/hello-libs/app/build.gradle index 7072a8985..db6aa7947 100644 --- a/other-builds/ndkbuild/hello-libs/app/build.gradle +++ b/other-builds/ndkbuild/hello-libs/app/build.gradle @@ -2,15 +2,17 @@ // generate 2 libs on terminal ( or command line ) // please refer to ${project}/gen-libs/gen_lib.sh for details -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.example.hellolibs' diff --git a/other-builds/ndkbuild/hello-libs/build.gradle b/other-builds/ndkbuild/hello-libs/build.gradle index 77ffc4211..9823be4b1 100644 --- a/other-builds/ndkbuild/hello-libs/build.gradle +++ b/other-builds/ndkbuild/hello-libs/build.gradle @@ -1,25 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file 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 cf0d1095e..5b18cc8eb 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/hello-libs/settings.gradle b/other-builds/ndkbuild/hello-libs/settings.gradle index fe87a35dd..51c95ee1b 100644 --- a/other-builds/ndkbuild/hello-libs/settings.gradle +++ b/other-builds/ndkbuild/hello-libs/settings.gradle @@ -1,3 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/hello-neon/app/build.gradle b/other-builds/ndkbuild/hello-neon/app/build.gradle index 6c2be544c..ce29279f5 100644 --- a/other-builds/ndkbuild/hello-neon/app/build.gradle +++ b/other-builds/ndkbuild/hello-neon/app/build.gradle @@ -1,11 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} + // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.helloneon" diff --git a/other-builds/ndkbuild/hello-neon/build.gradle b/other-builds/ndkbuild/hello-neon/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/hello-neon/build.gradle +++ b/other-builds/ndkbuild/hello-neon/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 b1f03358c..e1b821918 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/hello-neon/settings.gradle b/other-builds/ndkbuild/hello-neon/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/hello-neon/settings.gradle +++ b/other-builds/ndkbuild/hello-neon/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/native-activity/app/build.gradle b/other-builds/ndkbuild/native-activity/app/build.gradle index 9cdc08eaf..7d80d7df3 100644 --- a/other-builds/ndkbuild/native-activity/app/build.gradle +++ b/other-builds/ndkbuild/native-activity/app/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.example.native_activity' diff --git a/other-builds/ndkbuild/native-activity/build.gradle b/other-builds/ndkbuild/native-activity/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/native-activity/build.gradle +++ b/other-builds/ndkbuild/native-activity/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 4fb8566c2..397b26972 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/native-activity/settings.gradle b/other-builds/ndkbuild/native-activity/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/native-activity/settings.gradle +++ b/other-builds/ndkbuild/native-activity/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/native-audio/app/build.gradle b/other-builds/ndkbuild/native-audio/app/build.gradle index 35e428414..bc3de5c98 100644 --- a/other-builds/ndkbuild/native-audio/app/build.gradle +++ b/other-builds/ndkbuild/native-audio/app/build.gradle @@ -1,13 +1,16 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} + // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' - defaultConfig { + defaultConfig { applicationId 'com.example.nativeaudio' minSdkVersion 14 targetSdkVersion 28 diff --git a/other-builds/ndkbuild/native-audio/build.gradle b/other-builds/ndkbuild/native-audio/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/native-audio/build.gradle +++ b/other-builds/ndkbuild/native-audio/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 6d971a1da..e580e2331 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/native-audio/settings.gradle b/other-builds/ndkbuild/native-audio/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/native-audio/settings.gradle +++ b/other-builds/ndkbuild/native-audio/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/native-codec/app/build.gradle b/other-builds/ndkbuild/native-codec/app/build.gradle index c3c49b0b2..f4278f688 100644 --- a/other-builds/ndkbuild/native-codec/app/build.gradle +++ b/other-builds/ndkbuild/native-codec/app/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.nativecodec' diff --git a/other-builds/ndkbuild/native-codec/build.gradle b/other-builds/ndkbuild/native-codec/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/native-codec/build.gradle +++ b/other-builds/ndkbuild/native-codec/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 b39833711..af6f84582 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/native-codec/settings.gradle b/other-builds/ndkbuild/native-codec/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/native-codec/settings.gradle +++ b/other-builds/ndkbuild/native-codec/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/native-media/app/build.gradle b/other-builds/ndkbuild/native-media/app/build.gradle index 7a87b0e90..87ac28e83 100644 --- a/other-builds/ndkbuild/native-media/app/build.gradle +++ b/other-builds/ndkbuild/native-media/app/build.gradle @@ -1,11 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} + // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.nativemedia' diff --git a/other-builds/ndkbuild/native-media/build.gradle b/other-builds/ndkbuild/native-media/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/native-media/build.gradle +++ b/other-builds/ndkbuild/native-media/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 0fb76908e..ed2110b9a 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/native-media/settings.gradle b/other-builds/ndkbuild/native-media/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/native-media/settings.gradle +++ b/other-builds/ndkbuild/native-media/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/native-plasma/app/build.gradle b/other-builds/ndkbuild/native-plasma/app/build.gradle index 093ca38ef..90f79d52d 100644 --- a/other-builds/ndkbuild/native-plasma/app/build.gradle +++ b/other-builds/ndkbuild/native-plasma/app/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.native_plasma' diff --git a/other-builds/ndkbuild/native-plasma/build.gradle b/other-builds/ndkbuild/native-plasma/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/native-plasma/build.gradle +++ b/other-builds/ndkbuild/native-plasma/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 4f45f4edf..d4de22d67 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/native-plasma/settings.gradle b/other-builds/ndkbuild/native-plasma/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/native-plasma/settings.gradle +++ b/other-builds/ndkbuild/native-plasma/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/nn-samples/basic/build.gradle b/other-builds/ndkbuild/nn-samples/basic/build.gradle index 8f0286954..4956dfbf9 100644 --- a/other-builds/ndkbuild/nn-samples/basic/build.gradle +++ b/other-builds/ndkbuild/nn-samples/basic/build.gradle @@ -1,14 +1,15 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.android.basic" @@ -41,7 +42,7 @@ android { } dependencies { implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0" implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0" } diff --git a/other-builds/ndkbuild/nn-samples/build.gradle b/other-builds/ndkbuild/nn-samples/build.gradle index f1866585d..9823be4b1 100644 --- a/other-builds/ndkbuild/nn-samples/build.gradle +++ b/other-builds/ndkbuild/nn-samples/build.gradle @@ -1,19 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - ext.kotlin_version = '1.3.72' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/other-builds/ndkbuild/nn-samples/settings.gradle b/other-builds/ndkbuild/nn-samples/settings.gradle index e9dfb1c22..290d228a7 100644 --- a/other-builds/ndkbuild/nn-samples/settings.gradle +++ b/other-builds/ndkbuild/nn-samples/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':basic' diff --git a/other-builds/ndkbuild/san-angeles/app/build.gradle b/other-builds/ndkbuild/san-angeles/app/build.gradle index b8fb9fba8..746d271f2 100644 --- a/other-builds/ndkbuild/san-angeles/app/build.gradle +++ b/other-builds/ndkbuild/san-angeles/app/build.gradle @@ -1,6 +1,8 @@ // To demo apk split feature as documented at // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits#TOC-ABIs-Splits -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + @@ -10,8 +12,8 @@ import com.android.build.OutputFile ext.versionCodes = ['armeabi-v7a':1, 'arm64-v8a':2, 'x86':3] android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.SanAngeles' diff --git a/other-builds/ndkbuild/san-angeles/build.gradle b/other-builds/ndkbuild/san-angeles/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/san-angeles/build.gradle +++ b/other-builds/ndkbuild/san-angeles/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 0a8729801..dd925dbc8 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/san-angeles/settings.gradle b/other-builds/ndkbuild/san-angeles/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/san-angeles/settings.gradle +++ b/other-builds/ndkbuild/san-angeles/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/other-builds/ndkbuild/teapots/build.gradle b/other-builds/ndkbuild/teapots/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/teapots/build.gradle +++ b/other-builds/ndkbuild/teapots/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/other-builds/ndkbuild/teapots/classic-teapot/build.gradle b/other-builds/ndkbuild/teapots/classic-teapot/build.gradle index d8cb13adf..4fe2092f9 100644 --- a/other-builds/ndkbuild/teapots/classic-teapot/build.gradle +++ b/other-builds/ndkbuild/teapots/classic-teapot/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.sample.teapot" diff --git a/other-builds/ndkbuild/teapots/gradle/wrapper/gradle-wrapper.properties b/other-builds/ndkbuild/teapots/gradle/wrapper/gradle-wrapper.properties index 4b131b885..6ddf66171 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/teapots/more-teapots/build.gradle b/other-builds/ndkbuild/teapots/more-teapots/build.gradle index bfaaf44d0..b09c98822 100644 --- a/other-builds/ndkbuild/teapots/more-teapots/build.gradle +++ b/other-builds/ndkbuild/teapots/more-teapots/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} // pointing to cmake's source code for the same project def REMOTE_SRC_ROOT = '../../../../' + rootProject.getName() + '/' + project.getName() + '/src/main' android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.sample.moreteapots" diff --git a/other-builds/ndkbuild/teapots/settings.gradle b/other-builds/ndkbuild/teapots/settings.gradle index 83feec1aa..a040b37ec 100644 --- a/other-builds/ndkbuild/teapots/settings.gradle +++ b/other-builds/ndkbuild/teapots/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':classic-teapot',':more-teapots' diff --git a/other-builds/ndkbuild/two-libs/app/build.gradle b/other-builds/ndkbuild/two-libs/app/build.gradle index c650f1210..ce5b537ca 100644 --- a/other-builds/ndkbuild/two-libs/app/build.gradle +++ b/other-builds/ndkbuild/two-libs/app/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.twolibs" diff --git a/other-builds/ndkbuild/two-libs/build.gradle b/other-builds/ndkbuild/two-libs/build.gradle index 1f50b57b8..9823be4b1 100644 --- a/other-builds/ndkbuild/two-libs/build.gradle +++ b/other-builds/ndkbuild/two-libs/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file 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 d67ab6d6d..5814dda8c 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/other-builds/ndkbuild/two-libs/settings.gradle b/other-builds/ndkbuild/two-libs/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/other-builds/ndkbuild/two-libs/settings.gradle +++ b/other-builds/ndkbuild/two-libs/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/prefab/curl-ssl/app/build.gradle b/prefab/curl-ssl/app/build.gradle index 0af64f3c3..e0d55e859 100644 --- a/prefab/curl-ssl/app/build.gradle +++ b/prefab/curl-ssl/app/build.gradle @@ -16,13 +16,12 @@ plugins { id 'com.android.application' - id 'kotlin-android' - id 'kotlin-android-extensions' + id 'org.jetbrains.kotlin.android' } android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId "com.example.curlssl" minSdkVersion 21 @@ -62,7 +61,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" implementation 'com.android.support:appcompat-v7:30.0.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation "com.android.ndk.thirdparty:curl:7.79.1-beta-1" diff --git a/prefab/curl-ssl/build.gradle b/prefab/curl-ssl/build.gradle index a73f249cf..0a55bafad 100644 --- a/prefab/curl-ssl/build.gradle +++ b/prefab/curl-ssl/build.gradle @@ -14,25 +14,13 @@ * limitations under the License. */ -buildscript { - ext.kotlin_version = '1.3.61' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties b/prefab/curl-ssl/gradle/wrapper/gradle-wrapper.properties index 17887cd85..47433a9a5 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/prefab/curl-ssl/settings.gradle b/prefab/curl-ssl/settings.gradle index d41023911..10d550aeb 100644 --- a/prefab/curl-ssl/settings.gradle +++ b/prefab/curl-ssl/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} rootProject.name='curl-ssl' include ':app' diff --git a/prefab/prefab-dependency/app/build.gradle b/prefab/prefab-dependency/app/build.gradle index 0bfbcdd8c..85720edd6 100644 --- a/prefab/prefab-dependency/app/build.gradle +++ b/prefab/prefab-dependency/app/build.gradle @@ -16,20 +16,22 @@ plugins { id 'com.android.application' - id 'kotlin-android' - id 'kotlin-android-extensions' + id 'org.jetbrains.kotlin.android' } android { - compileSdkVersion 30 + compileSdk 33 + ndkVersion '25.1.8937393' - buildFeatures.prefab = true + buildFeatures { + prefab = true + viewBinding = true + } defaultConfig { applicationId "com.example.com.example.prefabdependency" minSdkVersion 21 targetSdkVersion 30 - ndkVersion '22.1.7171670' versionCode 1 versionName "1.0" @@ -64,7 +66,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10" implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation "com.android.ndk.thirdparty:jsoncpp:1.8.4-alpha-1" diff --git a/prefab/prefab-dependency/app/src/main/java/com/example/prefabdependency/MainActivity.kt b/prefab/prefab-dependency/app/src/main/java/com/example/prefabdependency/MainActivity.kt index 77b8fda5d..0209f7746 100644 --- a/prefab/prefab-dependency/app/src/main/java/com/example/prefabdependency/MainActivity.kt +++ b/prefab/prefab-dependency/app/src/main/java/com/example/prefabdependency/MainActivity.kt @@ -18,18 +18,18 @@ package com.example.prefabdependency import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import kotlinx.android.synthetic.main.activity_json_parse.* +import com.example.prefabdependency.databinding.ActivityJsonParseBinding class MainActivity : AppCompatActivity() { + private lateinit var binding: ActivityJsonParseBinding + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - /* Retrieve our TextView and set its content. - * the text is retrieved by calling a native - * function. - */ - setContentView(R.layout.activity_json_parse) - result_textview.text = getJsonValue( + binding = ActivityJsonParseBinding.inflate(layoutInflater) + val view = binding.root + setContentView(view) + binding.resultTextview.text = getJsonValue( """ { "cpp": "clang", diff --git a/prefab/prefab-dependency/build.gradle b/prefab/prefab-dependency/build.gradle index bb1b0db29..27207dd0f 100644 --- a/prefab/prefab-dependency/build.gradle +++ b/prefab/prefab-dependency/build.gradle @@ -14,25 +14,13 @@ * limitations under the License. */ -buildscript { - ext.kotlin_version = '1.3.61' - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties b/prefab/prefab-dependency/gradle/wrapper/gradle-wrapper.properties index 17887cd85..47433a9a5 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip diff --git a/prefab/prefab-dependency/settings.gradle b/prefab/prefab-dependency/settings.gradle index 670b590ee..fd47d13b1 100644 --- a/prefab/prefab-dependency/settings.gradle +++ b/prefab/prefab-dependency/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} rootProject.name='prefab-dependency' include ':app' diff --git a/prefab/prefab-publishing/build.gradle b/prefab/prefab-publishing/build.gradle index 2e01bcd04..27207dd0f 100644 --- a/prefab/prefab-publishing/build.gradle +++ b/prefab/prefab-publishing/build.gradle @@ -14,23 +14,13 @@ * limitations under the License. */ -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } task clean(type: Delete) { delete rootProject.buildDir -} +} \ No newline at end of file diff --git a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties index 8e1420f35..8b37eb9bb 100644 --- a/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties +++ b/prefab/prefab-publishing/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Nov 15 13:10:49 CST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/prefab/prefab-publishing/mylibrary/build.gradle b/prefab/prefab-publishing/mylibrary/build.gradle index 4e6ce4049..93f19c134 100644 --- a/prefab/prefab-publishing/mylibrary/build.gradle +++ b/prefab/prefab-publishing/mylibrary/build.gradle @@ -19,8 +19,8 @@ plugins { } android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { minSdkVersion 16 diff --git a/prefab/prefab-publishing/settings.gradle b/prefab/prefab-publishing/settings.gradle index ba4706f75..82d60d747 100644 --- a/prefab/prefab-publishing/settings.gradle +++ b/prefab/prefab-publishing/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} rootProject.name='prefab-publishing' include ':mylibrary' diff --git a/san-angeles/app/build.gradle b/san-angeles/app/build.gradle index 469010474..82b12bacd 100644 --- a/san-angeles/app/build.gradle +++ b/san-angeles/app/build.gradle @@ -1,13 +1,15 @@ // To demo apk split feature as documented at // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits#TOC-ABIs-Splits -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} import com.android.build.OutputFile ext.versionCodes = ['armeabi-v7a':1, 'arm64-v8a':2, 'mips':3, 'x86':4] android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.SanAngeles' diff --git a/san-angeles/build.gradle b/san-angeles/build.gradle index b9d2ec831..9823be4b1 100644 --- a/san-angeles/build.gradle +++ b/san-angeles/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/san-angeles/gradle/wrapper/gradle-wrapper.properties b/san-angeles/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/san-angeles/settings.gradle b/san-angeles/settings.gradle index e7b4def49..1e7b2cc14 100644 --- a/san-angeles/settings.gradle +++ b/san-angeles/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':app' diff --git a/sensor-graph/accelerometer/build.gradle b/sensor-graph/accelerometer/build.gradle index 677a8a7cf..b364328c8 100644 --- a/sensor-graph/accelerometer/build.gradle +++ b/sensor-graph/accelerometer/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.android.accelerometergraph' diff --git a/sensor-graph/build.gradle b/sensor-graph/build.gradle index b9d2ec831..9823be4b1 100644 --- a/sensor-graph/build.gradle +++ b/sensor-graph/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/sensor-graph/gradle/wrapper/gradle-wrapper.properties b/sensor-graph/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sensor-graph/settings.gradle b/sensor-graph/settings.gradle index 8d876c35f..191c26583 100644 --- a/sensor-graph/settings.gradle +++ b/sensor-graph/settings.gradle @@ -1,2 +1,16 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include 'accelerometer' diff --git a/teapots/build.gradle b/teapots/build.gradle index b9d2ec831..9823be4b1 100755 --- a/teapots/build.gradle +++ b/teapots/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/teapots/choreographer-30fps/build.gradle b/teapots/choreographer-30fps/build.gradle index 04a74ced8..33901e935 100644 --- a/teapots/choreographer-30fps/build.gradle +++ b/teapots/choreographer-30fps/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.sample.choreographer' diff --git a/teapots/classic-teapot/build.gradle b/teapots/classic-teapot/build.gradle index 860a6d594..a50b6b89a 100644 --- a/teapots/classic-teapot/build.gradle +++ b/teapots/classic-teapot/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.sample.teapot' diff --git a/teapots/gradle/wrapper/gradle-wrapper.properties b/teapots/gradle/wrapper/gradle-wrapper.properties index ad1047476..ffc4c5ce9 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip \ No newline at end of file diff --git a/teapots/image-decoder/build.gradle b/teapots/image-decoder/build.gradle index 06db6e059..322dadc1e 100644 --- a/teapots/image-decoder/build.gradle +++ b/teapots/image-decoder/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.sample.imagedecoder' diff --git a/teapots/more-teapots/build.gradle b/teapots/more-teapots/build.gradle index 9d85df1ef..5e0b36903 100644 --- a/teapots/more-teapots/build.gradle +++ b/teapots/more-teapots/build.gradle @@ -1,9 +1,10 @@ -apply plugin: 'com.android.application' - +plugins { + id 'com.android.application' +} android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.sample.moreteapots' diff --git a/teapots/settings.gradle b/teapots/settings.gradle index 62ea575f5..87ae50612 100644 --- a/teapots/settings.gradle +++ b/teapots/settings.gradle @@ -1,3 +1,17 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':classic-teapot', ':more-teapots', ':choreographer-30fps', ':textured-teapot', ':image-decoder' diff --git a/teapots/textured-teapot/build.gradle b/teapots/textured-teapot/build.gradle index 0917ceb76..3d3b1b40d 100644 --- a/teapots/textured-teapot/build.gradle +++ b/teapots/textured-teapot/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 30 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId = 'com.sample.texturedteapot' diff --git a/webp/build.gradle b/webp/build.gradle index b9d2ec831..9823be4b1 100644 --- a/webp/build.gradle +++ b/webp/build.gradle @@ -1,17 +1,10 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - google() - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:7.1.3' - } +plugins { + id 'com.android.application' version '7.3.1' apply false + id 'com.android.library' version '7.3.1' apply false + id 'org.jetbrains.kotlin.android' version '1.7.10' apply false } -allprojects { - repositories { - google() - mavenCentral() - } -} +task clean(type: Delete) { + delete rootProject.buildDir +} \ No newline at end of file diff --git a/webp/gradle/wrapper/gradle-wrapper.properties b/webp/gradle/wrapper/gradle-wrapper.properties index a0f7639f7..b1159fc54 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-7.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/webp/settings.gradle b/webp/settings.gradle index 3a834e6dc..651bb4682 100644 --- a/webp/settings.gradle +++ b/webp/settings.gradle @@ -1 +1,15 @@ +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} include ':view' diff --git a/webp/view/build.gradle b/webp/view/build.gradle index e96232501..92dda329f 100644 --- a/webp/view/build.gradle +++ b/webp/view/build.gradle @@ -1,8 +1,10 @@ -apply plugin: 'com.android.application' +plugins { + id 'com.android.application' +} android { - compileSdkVersion 29 - ndkVersion '22.1.7171670' + compileSdk 33 + ndkVersion '25.1.8937393' defaultConfig { applicationId 'com.example.webp_view' From 1b21dc39837abe0b1b471d5e300eb184ae97ff47 Mon Sep 17 00:00:00 2001 From: James Farrell Date: Thu, 17 Nov 2022 17:20:04 -0600 Subject: [PATCH 2/2] Restore "clean" before building. --- .ci_tools/build_samples.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci_tools/build_samples.sh b/.ci_tools/build_samples.sh index 97ba18b12..43496b96a 100755 --- a/.ci_tools/build_samples.sh +++ b/.ci_tools/build_samples.sh @@ -64,7 +64,7 @@ fi for d in "${projects[@]}"; do pushd ${NDK_SAMPLE_REPO}/${d} >/dev/null echo "Building ${d}" - TERM=dumb ./gradlew ${VERBOSITY} assembleDebug + TERM=dumb ./gradlew ${VERBOSITY} clean assembleDebug popd >/dev/null done