Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade Android Gradle (#33681)

Browse source 
* Upgrade to Gradle 8.9

Gradle 8.0 is no longer supported by Android Studio.

Signed-off-by: clocks <doomsdayrs@gmail.com>

* Upgrade to AGP to 8.7

Signed-off-by: clocks <doomsdayrs@gmail.com>

* Update to Android Build Tools 34.0.0

Signed-off-by: clocks <doomsdayrs@gmail.com>

---------

Signed-off-by: clocks <doomsdayrs@gmail.com>
This commit is contained in:
Clocks 2024-10-09 01:25:22 -04:00 • committed by GitHub
parent ff6523c37e
commit 7df18aecfe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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: - Run the following command to install the necessary components:
```shell ```shell
sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install sudo $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --install
"build-tools;33.0.2" \ "build-tools;34.0.00 \
"emulator" \ "emulator" \
"ndk;26.2.11394342" \ "ndk;26.2.11394342" \
"platform-tools" \ "platform-tools" \

2
etc/shell.nix
View file

@ -35,7 +35,7 @@ let
llvmPackages = llvmPackages_14; llvmPackages = llvmPackages_14;
stdenv = llvmPackages.stdenv; stdenv = llvmPackages.stdenv;
buildToolsVersion = "33.0.2"; buildToolsVersion = "34.0.0";
androidComposition = androidenv.composeAndroidPackages { androidComposition = androidenv.composeAndroidPackages {
buildToolsVersions = [ buildToolsVersion ]; buildToolsVersions = [ buildToolsVersion ];
includeEmulator = true; includeEmulator = true;

4
support/android/apk/build.gradle
View file

@ -2,8 +2,8 @@ import java.text.SimpleDateFormat
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id 'com.android.application' version '8.0.1' apply false id 'com.android.application' version '8.7.0' apply false
id 'com.android.library' version '8.0.1' apply false id 'com.android.library' version '8.7.0' apply false
} }
// Utility methods // Utility methods

3
support/android/apk/gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,5 +1,6 @@
#Sun Oct 06 18:17:20 EDT 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
support/android/apk/servoapp/build.gradle
View file

@ -7,7 +7,7 @@ import java.util.regex.Pattern
android { android {
compileSdk 33 compileSdk 33
buildToolsVersion = "33.0.2" buildToolsVersion = "34.0.0"
namespace 'org.servo.servoshell' namespace 'org.servo.servoshell'

2
support/android/apk/servoview/build.gradle
View file

@ -8,7 +8,7 @@ import java.util.regex.Pattern
android { android {
compileSdk 33 compileSdk 33
buildToolsVersion = "33.0.2" buildToolsVersion = "34.0.0"
namespace 'org.servo.servoview' namespace 'org.servo.servoview'