upgrade agp 8.0

app/build.gradle

@@ -17,11 +17,10 @@ def gitCommits = Integer.parseInt('git rev-list HEAD --count'.execute().text.tri
 
 android {
     compileSdk = compile_sdk_version
-    buildToolsVersion = build_tool_version
     namespace 'io.legado.app'
     kotlin {
         jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of("11"))
+            languageVersion.set(JavaLanguageVersion.of(17))
         }
     }
 
@@ -87,16 +86,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-
-    android.applicationVariants.all { variant ->
-        variant.outputs.all {
-            def flavor = variant.productFlavors[0].name
-            outputFileName = "${name}_${flavor}_${defaultConfig.versionName}.apk"
-        }
-    }
-
-    flavorDimensions.add("mode")
-
+    flavorDimensions = ['mode']
     productFlavors {
         app {
             dimension "mode"
@@ -114,14 +104,21 @@ android {
         }
     }
 
+    android.applicationVariants.all { variant ->
+        variant.outputs.all {
+            def flavor = variant.productFlavors[0].name
+            outputFileName = "${name}_${flavor}_${defaultConfig.versionName}.apk"
+        }
+    }
+
     compileOptions {
         // Flag to enable support for the new language APIs
         coreLibraryDesugaringEnabled true
         // Sets Java compatibility to Java 11
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
-    packagingOptions {
+    packaging {
         resources.excludes.add('META-INF/*')
     }
 
@@ -231,7 +228,7 @@ dependencies {
     implementation("org.nanohttpd:nanohttpd-websocket:$nanoHttpdVersion")
 
     //二维码
-    implementation('com.github.jenly1314:zxing-lite:2.3.1')
+    implementation('com.github.jenly1314:zxing-lite:2.4.0')
 
     //颜色选择
     implementation('com.jaredrummler:colorpicker:1.1.0')

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         compile_sdk_version = 33
         build_tool_version = '33.0.1'
         kotlin_version = '1.8.0'
-        agp_version = '7.4.2'
+        agp_version = '8.0.0'
         exoplayer_version = '2.18.4'
         splitties_version = '3.0.0'
         room_version = '2.5.0'

gradle.properties

@@ -40,3 +40,4 @@ android.nonTransitiveRClass=true
 CronetVersion=112.0.5615.47
 CronetMainVersion=112.0.0.0
 android.injected.testOnly=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Sep 26 08:03:55 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

modules/book/build.gradle

@@ -5,8 +5,12 @@ plugins {
 
 android {
     compileSdk = compile_sdk_version
-    buildToolsVersion = build_tool_version
     namespace 'me.ag2s'
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
     defaultConfig {
         minSdk 21
         targetSdk 33
@@ -16,8 +20,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     lint {
         checkDependencies true

modules/rhino1.7.3/build.gradle

@@ -5,8 +5,12 @@ plugins {
 
 android {
     compileSdk = compile_sdk_version
-    buildToolsVersion = build_tool_version
     namespace 'com.script'
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
     defaultConfig {
         minSdk 21
         targetSdk 33
@@ -15,8 +19,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     lint {
         checkDependencies true

modules/rhino1.7.4/build.gradle

@@ -5,8 +5,12 @@ plugins {
 
 android {
     compileSdk = compile_sdk_version
-    buildToolsVersion = build_tool_version
     namespace 'com.script'
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
     defaultConfig {
         minSdk 24
         targetSdk 33
@@ -15,8 +19,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     lint {
         checkDependencies true