diff --git a/android/build.gradle b/android/build.gradle index 4d6ebb91f8..47173999c6 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -83,12 +83,12 @@ buildscript { 'minSdk': 21, 'targetSdk': 34, 'compileSdk': 34, - 'kotlin': '1.9.21', - 'kotlin_coroutines': '1.7.3', + 'kotlin': '2.0.0', + 'kotlin_coroutines': '1.9.0-RC', 'buildTools': '34.0.0', - 'ndk': '26.1.10909125', - 'androidx_core': '1.12.0', - 'androidx_annotations': '1.7.0' + 'ndk': '27.0.11718014', + 'androidx_core': '1.13.1', + 'androidx_annotations': '1.8.0' ] ext.deps = [ @@ -104,7 +104,7 @@ buildscript { ] dependencies { - classpath 'com.android.tools.build:gradle:8.2.0' + classpath 'com.android.tools.build:gradle:8.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index ad7df40dff..980175fc26 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Nov 17 10:40:18 PST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/build/android/build.sh b/build/android/build.sh index 4a6b9eebe9..3eb0a98a44 100755 --- a/build/android/build.sh +++ b/build/android/build.sh @@ -57,7 +57,8 @@ FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION:-$(cat `dirname $0`/ndk.version)} # Install the required NDK version specifically (if not present) if [[ ! -d "${ANDROID_HOME}/ndk/$FILAMENT_NDK_VERSION" ]]; then - ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "ndk;$FILAMENT_NDK_VERSION" > /dev/null + yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses + ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager "ndk;$FILAMENT_NDK_VERSION" fi # Only build 1 64 bit target during presubmit to cut down build times during presubmit diff --git a/build/android/ndk.version b/build/android/ndk.version index 365a3c4156..f58ef0240a 100644 --- a/build/android/ndk.version +++ b/build/android/ndk.version @@ -1 +1 @@ -26.1.10909125 \ No newline at end of file +27.0.11718014 \ No newline at end of file