Adjustments for Gradle 8 build environment.
Gradle 8 requires JDK version 11. Update build class path to pick up new Gradle version.
This commit is contained in:
parent
c061c64c3d
commit
b27e4c85ee
|
@ -36,8 +36,8 @@ androidGitVersion {
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace = "audio.funkwhale.ffa"
|
namespace = "audio.funkwhale.ffa"
|
||||||
|
@ -47,7 +47,7 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
jvmTarget = JavaVersion.VERSION_11.toString()
|
jvmTarget = JavaVersion.VERSION_17.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
|
|
|
@ -13,7 +13,7 @@ buildscript {
|
||||||
val navVersion: String by extra
|
val navVersion: String by extra
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("com.android.tools.build:gradle:7.4.2")
|
classpath("com.android.tools.build:gradle:8.1.2")
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20")
|
||||||
classpath("com.github.bjoernq:unmockplugin:0.7.9")
|
classpath("com.github.bjoernq:unmockplugin:0.7.9")
|
||||||
classpath("com.github.ben-manes:gradle-versions-plugin:0.46.0")
|
classpath("com.github.ben-manes:gradle-versions-plugin:0.46.0")
|
||||||
|
|
|
@ -4,3 +4,6 @@ kotlin.code.style=official
|
||||||
|
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
android.defaults.buildfeatures.buildconfig=true
|
||||||
|
android.nonTransitiveRClass=false
|
||||||
|
android.nonFinalResIds=false
|
||||||
|
|
Loading…
Reference in New Issue