chore: Update to AGP 8.7.3, Java 11 source/target

NineWorlds · Dec 15, 2024 · c40e06e · c40e06e
1 parent 4dd3bb4
commit c40e06e
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
 
   }
   dependencies {
-    classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
+    classpath("com.google.firebase:firebase-crashlytics-gradle:3.0.2")
     classpath("com.android.tools.build:gradle:${libs.versions.androidPluginVersion.get()}")
     classpath("org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${libs.versions.kotlinVersion.get()}")
@@ -70,7 +70,7 @@ subprojects {
   allprojects {
     tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
       kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
       }
     }
   }

diff --git a/emby-lib/build.gradle.kts b/emby-lib/build.gradle.kts
@@ -22,8 +22,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
 
   sourceSets {

diff --git a/gradle.properties b/gradle.properties
@@ -7,4 +7,5 @@ android.enableJetifier=true
 android.jetifier.ignorelist=bcprov,robolectric
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.unsafe.configuration-cache=false
+org.gradle.configuration-cache=true
+
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -16,7 +16,7 @@ junit = "1.2.1"
 juniversalchardetVersion = "1.0.3"
 kotlinVersion = "1.9.24"
 kotlinCoroutinesVersion = "1.7.3"
-androidPluginVersion = "8.5.0"
+androidPluginVersion = "8.7.3"
 leanbackPreferenceVersion = "1.1.0-rc01"
 leanbackVersion = "1.1.0-rc02"
 legacySupportV4Version = "1.0.0"

diff --git a/jacoco.gradle b/jacoco.gradle
@@ -1,11 +1,12 @@
 apply plugin: "jacoco"
 
-tasks.withType(Test) {
+tasks.withType(Test).configureEach {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
 
-task jacocoTestReport(type: JacocoReport, dependsOn: 'testDebugUnitTest') {
+tasks.register('jacocoTestReport', JacocoReport) {
+    dependsOn 'testDebugUnitTest'
 
     reports {
         xml.required = true

diff --git a/manager/build.gradle.kts b/manager/build.gradle.kts
@@ -22,8 +22,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
 
   sourceSets {

diff --git a/serenity-android-common/build.gradle.kts b/serenity-android-common/build.gradle.kts
@@ -15,8 +15,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
   }
 
   sourceSets {

diff --git a/serenity-app/build.gradle.kts b/serenity-app/build.gradle.kts
@@ -107,10 +107,6 @@ android {
   }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = JavaVersion.VERSION_11.toString()
-}
-
 dependencies {
 
   implementation(platform(libs.firebase.bom))

diff --git a/serenity-common/build.gradle.kts b/serenity-common/build.gradle.kts
@@ -8,8 +8,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 

diff --git a/subtitle-converter/build.gradle.kts b/subtitle-converter/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
 
 dependencies {