Bump gradle/AGP version to 8

This commit is contained in:
Nicolas Pomepuy 2023-06-08 14:50:45 +02:00
parent 45ae8ec56d
commit bde92765a7
8 changed files with 19 additions and 6 deletions

View File

@ -63,6 +63,9 @@ android {
} }
} }
namespace 'org.videolan.vlc.donations' namespace 'org.videolan.vlc.donations'
buildFeatures {
aidl true
}
} }
static def getPublicApiKey(project) { static def getPublicApiKey(project) {

View File

@ -110,6 +110,10 @@ android {
assets.srcDirs += files("$projectDir/assets/schemas".toString()) assets.srcDirs += files("$projectDir/assets/schemas".toString())
} }
namespace 'org.videolan.vlc' namespace 'org.videolan.vlc'
buildFeatures {
renderScript true
aidl true
}
} }
def generateTranslation() { def generateTranslation() {
@ -132,7 +136,6 @@ def generateTranslation() {
} }
task generateSources(type: Jar) { task generateSources(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.srcDirs from android.sourceSets.main.java.srcDirs
} }

View File

@ -1,6 +1,6 @@
// 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.
buildscript { buildscript {
ext.android_plugin_version = '7.4.2' ext.android_plugin_version = '8.0.1'
ext.kotlin_version = '1.7.10' ext.kotlin_version = '1.7.10'
ext.kotlinx_version = '1.6.0' ext.kotlinx_version = '1.6.0'
repositories { repositories {
@ -13,7 +13,7 @@ buildscript {
classpath "com.android.tools.build:gradle:$android_plugin_version" classpath "com.android.tools.build:gradle:$android_plugin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' 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'
} }
} }

View File

@ -240,7 +240,7 @@ fi
if [ ! -d "gradle/wrapper" ]; then if [ ! -d "gradle/wrapper" ]; then
diagnostic "Downloading gradle" 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 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" wget ${GRADLE_URL} 2>/dev/null || curl -O ${GRADLE_URL} || fail "gradle: download failed"

View File

@ -5,6 +5,7 @@ cache:
- gradle-7.3.3/ - gradle-7.3.3/
- gradle-7.4/ - gradle-7.4/
- gradle-7.5/ - gradle-7.5/
- gradle-8.0/
- gradle/ - gradle/
- gradlew - gradlew

View File

@ -11,7 +11,6 @@ def allLicenses = ["LGPL-2.1"]
task sourcesJar(type: Jar) { task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs from android.sourceSets.main.java.srcDirs
classifier = 'sources'
} }
task javadoc(type: Javadoc) { task javadoc(type: Javadoc) {
@ -20,7 +19,6 @@ task javadoc(type: Javadoc) {
} }
task javadocJar(type: Jar, dependsOn: javadoc) { task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir from javadoc.destinationDir
} }

View File

@ -21,4 +21,7 @@ POM_DEVELOPER_NAME=VideoLAN
POM_DEVELOPER_URL=https://www.videolan.org/ POM_DEVELOPER_URL=https://www.videolan.org/
RELEASE_SIGNING_ENABLED=false RELEASE_SIGNING_ENABLED=false
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

View File

@ -28,6 +28,7 @@ ext {
library_version = "$rootProject.ext.medialibraryVersion" library_version = "$rootProject.ext.medialibraryVersion"
} }
android { android {
namespace 'org.videolan.medialibrary'
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
@ -74,6 +75,10 @@ android {
dataBinding { dataBinding {
enabled = true enabled = true
} }
buildFeatures {
renderScript true
aidl true
}
// Make per-variant version code // Make per-variant version code
libraryVariants.all { variant -> libraryVariants.all { variant ->