diff --git a/README.md b/README.md index 108722651fc..a9a036b23ca 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ For more detailed build instructions, see the Servo book under [Setting up your - Run the following command to install the necessary components: ```shell sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install - "build-tools;33.0.2" \ + "build-tools;34.0.00 \ "emulator" \ "ndk;26.2.11394342" \ "platform-tools" \ diff --git a/etc/shell.nix b/etc/shell.nix index fd83cd358f2..79b02dcda1a 100644 --- a/etc/shell.nix +++ b/etc/shell.nix @@ -35,7 +35,7 @@ let llvmPackages = llvmPackages_14; stdenv = llvmPackages.stdenv; - buildToolsVersion = "33.0.2"; + buildToolsVersion = "34.0.0"; androidComposition = androidenv.composeAndroidPackages { buildToolsVersions = [ buildToolsVersion ]; includeEmulator = true; diff --git a/support/android/apk/build.gradle b/support/android/apk/build.gradle index 974eb9ce2e0..4ddff3a3b04 100644 --- a/support/android/apk/build.gradle +++ b/support/android/apk/build.gradle @@ -2,8 +2,8 @@ import java.text.SimpleDateFormat // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.0.1' apply false - id 'com.android.library' version '8.0.1' apply false + id 'com.android.application' version '8.7.0' apply false + id 'com.android.library' version '8.7.0' apply false } // Utility methods diff --git a/support/android/apk/gradle/wrapper/gradle-wrapper.properties b/support/android/apk/gradle/wrapper/gradle-wrapper.properties index da1db5f04e8..2ca740d1562 100644 --- a/support/android/apk/gradle/wrapper/gradle-wrapper.properties +++ b/support/android/apk/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sun Oct 06 18:17:20 EDT 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/support/android/apk/servoapp/build.gradle b/support/android/apk/servoapp/build.gradle index 4cf399eeb96..c4168ff979d 100644 --- a/support/android/apk/servoapp/build.gradle +++ b/support/android/apk/servoapp/build.gradle @@ -7,7 +7,7 @@ import java.util.regex.Pattern android { compileSdk 33 - buildToolsVersion = "33.0.2" + buildToolsVersion = "34.0.0" namespace 'org.servo.servoshell' diff --git a/support/android/apk/servoview/build.gradle b/support/android/apk/servoview/build.gradle index 6b0976871b5..bd76ab0793c 100644 --- a/support/android/apk/servoview/build.gradle +++ b/support/android/apk/servoview/build.gradle @@ -8,7 +8,7 @@ import java.util.regex.Pattern android { compileSdk 33 - buildToolsVersion = "33.0.2" + buildToolsVersion = "34.0.0" namespace 'org.servo.servoview'