Skip to content

Display and control your Android device

Upgrade AGP (8.1.3) and Gradle to 8.4

Romain Vimonte8801cc3c049
diff --git a/build.gradle b/build.gradle
index f7e29b22..b27befb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.0'
+ classpath 'com.android.tools.build:gradle:8.1.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -23,7 +23,3 @@ allprojects {
options.compilerArgs << "-Xlint:deprecation"
}
}
-
-task clean(type: Delete) {
- delete rootProject.buildDir
-}
diff --git a/doc/build.md b/doc/build.md
index 54b7410b..15c567b5 100644
--- a/doc/build.md
+++ b/doc/build.md
@@ -58,7 +58,7 @@ sudo apt install gcc git pkg-config meson ninja-build libsdl2-dev \
libswresample-dev libusb-1.0-0-dev
# server build dependencies
-sudo apt install openjdk-11-jdk
+sudo apt install openjdk-17-jdk
```
On old versions (like Ubuntu 16.04), `meson` is too old. In that case, install
@@ -100,7 +100,7 @@ sudo apt install mingw-w64 mingw-w64-tools
You also need the JDK to build the server:
```bash
-sudo apt install openjdk-11-jdk
+sudo apt install openjdk-17-jdk
```
Then generate the releases:
@@ -168,13 +168,13 @@ brew install sdl2 ffmpeg libusb
brew install pkg-config meson
```
-Additionally, if you want to build the server, install Java 8 from Caskroom, and
+Additionally, if you want to build the server, install Java 17 from Caskroom, and
make it available from the `PATH`:
```bash
brew tap homebrew/cask-versions
-brew install adoptopenjdk/openjdk/adoptopenjdk11
-export JAVA_HOME="$(/usr/libexec/java_home --version 1.11)"
+brew install adoptopenjdk/openjdk/adoptopenjdk17
+export JAVA_HOME="$(/usr/libexec/java_home --version 1.17)"
export PATH="$JAVA_HOME/bin:$PATH"
```
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ec77e51..e411586a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/server/build.gradle b/server/build.gradle
index bee6509b..927906fc 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
namespace 'com.genymobile.scrcpy'
- compileSdkVersion 33
+ compileSdk 33
defaultConfig {
applicationId "com.genymobile.scrcpy"
minSdkVersion 21
@@ -17,6 +17,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
+ buildFeatures {
+ buildConfig true
+ aidl true
+ }
}
dependencies {