[Android] Bump gradle/AGP version to 8
Nicolas Pomepuy
git at videolan.org
Fri Jul 7 13:38:35 UTC 2023
vlc-android | branch: master | Nicolas Pomepuy <nicolas at videolabs.io> | Thu Jun 8 14:50:45 2023 +0200| [bde92765a787a4e5c28c4a57f0878adca0a6193e] | committer: Nicolas Pomepuy
Bump gradle/AGP version to 8
> https://code.videolan.org/videolan/vlc-android/commit/bde92765a787a4e5c28c4a57f0878adca0a6193e
---
application/donations/build.gradle | 3 +++
application/vlc-android/build.gradle | 5 ++++-
build.gradle | 4 ++--
buildsystem/compile.sh | 2 +-
buildsystem/gitlab/.gitlab-ci.yml | 1 +
buildsystem/publish.gradle | 2 --
gradle.properties | 3 +++
medialibrary/build.gradle | 5 +++++
8 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/application/donations/build.gradle b/application/donations/build.gradle
index 295a64c48e..cab4ed433e 100644
--- a/application/donations/build.gradle
+++ b/application/donations/build.gradle
@@ -63,6 +63,9 @@ android {
}
}
namespace 'org.videolan.vlc.donations'
+ buildFeatures {
+ aidl true
+ }
}
static def getPublicApiKey(project) {
diff --git a/application/vlc-android/build.gradle b/application/vlc-android/build.gradle
index e737e22873..03dc80eb8c 100644
--- a/application/vlc-android/build.gradle
+++ b/application/vlc-android/build.gradle
@@ -110,6 +110,10 @@ android {
assets.srcDirs += files("$projectDir/assets/schemas".toString())
}
namespace 'org.videolan.vlc'
+ buildFeatures {
+ renderScript true
+ aidl true
+ }
}
def generateTranslation() {
@@ -132,7 +136,6 @@ def generateTranslation() {
}
task generateSources(type: Jar) {
- classifier = 'sources'
from android.sourceSets.main.java.srcDirs
}
diff --git a/build.gradle b/build.gradle
index 18509c7f1c..e8524be70f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.android_plugin_version = '7.4.2'
+ ext.android_plugin_version = '8.0.1'
ext.kotlin_version = '1.7.10'
ext.kotlinx_version = '1.6.0'
repositories {
@@ -13,7 +13,7 @@ buildscript {
classpath "com.android.tools.build:gradle:$android_plugin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
- classpath 'com.vanniktech:gradle-maven-publish-plugin:0.22.0'
+ classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.2'
}
}
diff --git a/buildsystem/compile.sh b/buildsystem/compile.sh
index c89d23c5d8..35fe8676a8 100755
--- a/buildsystem/compile.sh
+++ b/buildsystem/compile.sh
@@ -240,7 +240,7 @@ fi
if [ ! -d "gradle/wrapper" ]; then
diagnostic "Downloading gradle"
- GRADLE_VERSION=7.5
+ GRADLE_VERSION=8.0
GRADLE_URL=https://download.videolan.org/pub/contrib/gradle/gradle-${GRADLE_VERSION}-bin.zip
wget ${GRADLE_URL} 2>/dev/null || curl -O ${GRADLE_URL} || fail "gradle: download failed"
diff --git a/buildsystem/gitlab/.gitlab-ci.yml b/buildsystem/gitlab/.gitlab-ci.yml
index e5f1c2496a..26c6bac607 100644
--- a/buildsystem/gitlab/.gitlab-ci.yml
+++ b/buildsystem/gitlab/.gitlab-ci.yml
@@ -5,6 +5,7 @@ cache:
- gradle-7.3.3/
- gradle-7.4/
- gradle-7.5/
+ - gradle-8.0/
- gradle/
- gradlew
diff --git a/buildsystem/publish.gradle b/buildsystem/publish.gradle
index 2753ff2a1a..41518d4781 100644
--- a/buildsystem/publish.gradle
+++ b/buildsystem/publish.gradle
@@ -11,7 +11,6 @@ def allLicenses = ["LGPL-2.1"]
task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
- classifier = 'sources'
}
task javadoc(type: Javadoc) {
@@ -20,7 +19,6 @@ task javadoc(type: Javadoc) {
}
task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
from javadoc.destinationDir
}
diff --git a/gradle.properties b/gradle.properties
index 592bb5c736..afecfe82e1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,4 +21,7 @@ POM_DEVELOPER_NAME=VideoLAN
POM_DEVELOPER_URL=https://www.videolan.org/
RELEASE_SIGNING_ENABLED=false
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/medialibrary/build.gradle b/medialibrary/build.gradle
index e99ad94fde..b21cf8d1fc 100644
--- a/medialibrary/build.gradle
+++ b/medialibrary/build.gradle
@@ -28,6 +28,7 @@ ext {
library_version = "$rootProject.ext.medialibraryVersion"
}
android {
+ namespace 'org.videolan.medialibrary'
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
@@ -74,6 +75,10 @@ android {
dataBinding {
enabled = true
}
+ buildFeatures {
+ renderScript true
+ aidl true
+ }
// Make per-variant version code
libraryVariants.all { variant ->
More information about the Android
mailing list