AGP 8.0.0, Gradle 8.1, JDK17でkspがJava target levelを勘違いする問題の対策

anko/build.gradle

@@ -24,14 +24,24 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility javaSourceCompatibility
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility javaTargetCompatibility
     }
     kotlinOptions {
         jvmTarget = kotlinJvmTarget
     }
 }
 
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
+}
+
 dependencies {
     testImplementation "junit:junit:$junitVersion"
     androidTestImplementation "androidx.test.ext:junit:$androidxTestExtJunitVersion"

apng/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: "java-library"
 apply plugin: "kotlin"
 
-sourceCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = javaSourceCompatibility
-targetCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = javaTargetCompatibility
 
 compileKotlin {
 
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = javaSourceCompatibility
-    targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = javaTargetCompatibility
 
     kotlinOptions {
         jvmTarget = kotlinJvmTarget

apng_android/build.gradle

@@ -6,8 +6,8 @@ android {
     buildToolsVersion stBuildToolsVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility javaSourceCompatibility
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility javaTargetCompatibility
     }
 
     namespace "jp.juggler.apng"
@@ -38,6 +38,16 @@ android {
     }
 }
 
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
+}
+
 repositories {
     mavenCentral()
 }

app/build.gradle

@@ -23,8 +23,8 @@ android {
 
     // exoPlayer 2.9.0 以降は Java 8 compiler support を要求する
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility javaSourceCompatibility
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility javaTargetCompatibility
         coreLibraryDesugaringEnabled true
     }
 
@@ -42,6 +42,7 @@ android {
 
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
 
     kotlinOptions {
@@ -150,6 +151,16 @@ android {
 
 }
 
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
+}
+
 static def gitBranch() {
     def branch = "(no branch)"
     def proc = "git status".execute()

app/src/main/java/jp/juggler/subwaytooter/Styler.kt

@@ -484,7 +484,7 @@ fun AppCompatActivity.setStatusBarColor(forceDark: Boolean = false) {
         var c = when {
             forceDark -> Color.BLACK
             else -> PrefI.ipStatusBarColor.value.notZero()
-                ?: attrColor(R.attr.colorPrimaryDark)
+                ?: attrColor(android.R.attr.colorPrimaryDark)
         }
         setStatusBarColorCompat(c)
 

app/src/main/java/jp/juggler/subwaytooter/util/AppOpener.kt

@@ -144,7 +144,7 @@ fun Activity.openCustomTab(url: String?) {
             CustomTabsIntent.Builder()
                 .setDefaultColorSchemeParams(
                     CustomTabColorSchemeParams.Builder()
-                        .setToolbarColor(attrColor(R.attr.colorPrimary))
+                        .setToolbarColor(attrColor(android.R.attr.colorPrimary))
                         .build()
                 )
                 .setShowTitle(true)

app/src/main/res/values/tag_ids.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- ビューのタグのキーに使うID -->
+    <item type="id" name="text" />
+</resources>

base/build.gradle

@@ -15,6 +15,10 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    buildFeatures {
+        buildConfig true
+    }
+
     buildTypes {
         release {
             minifyEnabled false
@@ -23,8 +27,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility javaSourceCompatibility
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility javaTargetCompatibility
         coreLibraryDesugaringEnabled true
     }
 
@@ -41,6 +45,16 @@ android {
     }
 }
 
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
+}
+
 dependencies {
     // desugar_jdk_libs 2.0.0 は AGP 7.4.0-alpha10 以降を要求する
     //noinspection GradleDependency

base/src/main/java/jp/juggler/util/ui/FontUtil.kt

@@ -5,7 +5,6 @@ import io.github.inflationx.calligraphy3.CalligraphyConfig
 import io.github.inflationx.calligraphy3.CalligraphyInterceptor
 import io.github.inflationx.calligraphy3.CalligraphyTypefaceSpan
 import io.github.inflationx.viewpump.ViewPump
-import jp.juggler.base.R
 
 fun initializeFont() {
     ViewPump.init(
@@ -13,7 +12,9 @@ fun initializeFont() {
             .addInterceptor(
                 CalligraphyInterceptor(
                     CalligraphyConfig.Builder()
-                        .setFontAttrId(R.attr.fontPath)
+                        // AGP8で参照するRクラスが分割されてエラーになる。
+                        // 指定する必要もないと思う…
+                        // .setFontAttrId(R.attr.fontPath)
                         .build()
                 )
             )

build.gradle

@@ -10,12 +10,15 @@ buildscript {
     ext.composeVersion = "1.0.5"
     ext.conscryptVersion = "2.5.2"
     ext.conscryptVersion = "2.5.2"
-    ext.coreKtxVersion = "1.9.0"
+    ext.coreKtxVersion = "1.10.0"
     ext.desugarLibVersion = "1.2.0"
     ext.detektVersion = "1.22.0"
     ext.glideVersion = "4.14.2"
+    ext.javaSourceCompatibility = JavaVersion.VERSION_1_8
+    ext.javaTargetCompatibility = JavaVersion.VERSION_1_8
     ext.junitVersion = "4.13.2"
     ext.koinVersion = "3.1.3"
+    ext.kotlinJvmToolchain = 17
     ext.kotlinJvmTarget = "1.8"
     ext.kotlinVersion = "1.8.0"
     ext.kotlinxCoroutinesVersion = "1.6.4"
@@ -34,7 +37,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
 
         // room のバージョンの影響で google-services を上げられない場合がある
         classpath "com.google.gms:google-services:4.3.15"

colorpicker/build.gradle

@@ -5,6 +5,12 @@ android {
     compileSdkVersion stCompileSdkVersion
     buildToolsVersion stBuildToolsVersion
 
+    compileOptions {
+        sourceCompatibility javaSourceCompatibility
+        targetCompatibility javaTargetCompatibility
+        coreLibraryDesugaringEnabled true
+    }
+
     defaultConfig {
         targetSdkVersion stTargetSdkVersion
         minSdkVersion stMinSdkVersion
@@ -12,14 +18,9 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
 
+    namespace 'com.jrummyapps.android.colorpicker'
     resourcePrefix "cpv_"
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-        coreLibraryDesugaringEnabled true
-    }
-
     kotlinOptions {
         jvmTarget = kotlinJvmTarget
         freeCompilerArgs += [
@@ -33,7 +34,16 @@ android {
     lint {
         abortOnError false
     }
-    namespace 'com.jrummyapps.android.colorpicker'
+}
+
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
 }
 
 dependencies {

emoji/build.gradle

@@ -6,8 +6,8 @@ android {
     buildToolsVersion stBuildToolsVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility javaSourceCompatibility
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility javaTargetCompatibility
     }
 
     defaultConfig {
@@ -28,3 +28,13 @@ android {
     }
     namespace 'jp.juggler.emoji'
 }
+
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
+}

gradle.properties

@@ -29,5 +29,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.debug.obsoleteApi=true
 
-# generate signed APK するときにエラーを出すことがある
 org.gradle.unsafe.configuration-cache=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Mon Jun 13 20:53:58 JST 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.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

icon_material_symbols/build.gradle

@@ -21,10 +21,20 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility javaSourceCompatibility
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility javaTargetCompatibility
     }
     kotlinOptions {
         jvmTarget = kotlinJvmTarget
     }
 }
+
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
+}

sample_apng/build.gradle

@@ -6,8 +6,8 @@ android {
     buildToolsVersion stBuildToolsVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility javaSourceCompatibility
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility javaTargetCompatibility
     }
 
     defaultConfig {
@@ -48,6 +48,16 @@ android {
     namespace 'jp.juggler.apng.sample'
 }
 
+kotlin {
+    jvmToolchain(kotlinJvmToolchain)
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
+    kotlinOptions {
+        jvmTarget = kotlinJvmTarget
+    }
+}
+
 dependencies {
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarLibVersion"
     implementation project(":base")