Merge pull request #308 from ptkNktq/update/env

ptkNktq · web-flow · commit 334232718620 · 2026-01-20T04:04:31.000+09:00
Update/env
diff --git a/AndroidApp/.idea/kotlinc.xml b/AndroidApp/.idea/kotlinc.xml
diff --git a/AndroidApp/README.md b/AndroidApp/README.md
@@ -1,5 +1,11 @@
 # Androidアプリ
 
+### 開発環境
+
+- Android Studio Otter 3 Feature Drop | 2025.2.3
+- Windows 11
+    - 一部 wsl2(Ubuntu 22.04.5 LTS)
+
 ### テスト
 
 ###### ユニットテスト
diff --git a/AndroidApp/app/build.gradle.kts b/AndroidApp/app/build.gradle.kts
@@ -16,12 +16,6 @@ android {
     }
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-    }
-}
-
 dependencies {
     implementation(project(":ui"))
     // diのために必要
diff --git a/AndroidApp/build-logic/src/main/kotlin/CommonApplication.kt b/AndroidApp/build-logic/src/main/kotlin/CommonApplication.kt
@@ -11,7 +11,6 @@ class CommonApplication : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.application")
-                apply("org.jetbrains.kotlin.android")
             }
             extensions.configure<ApplicationExtension> {
                 configureApplication(this)
diff --git a/AndroidApp/build-logic/src/main/kotlin/CommonLibrary.kt b/AndroidApp/build-logic/src/main/kotlin/CommonLibrary.kt
@@ -11,7 +11,6 @@ class CommonLibrary : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
-                apply("org.jetbrains.kotlin.android")
             }
             extensions.configure<LibraryExtension> {
                 configureLibrary(this)
diff --git a/AndroidApp/build-logic/src/main/kotlin/CommonLibraryCompose.kt b/AndroidApp/build-logic/src/main/kotlin/CommonLibraryCompose.kt
@@ -12,7 +12,6 @@ class CommonLibraryCompose : Plugin<Project> {
         with(target) {
             with(pluginManager) {
                 apply("com.android.library")
-                apply("org.jetbrains.kotlin.android")
                 apply("org.jetbrains.kotlin.plugin.compose")
             }
             extensions.configure<LibraryExtension> {
diff --git a/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Application.kt b/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Application.kt
@@ -1,20 +1,17 @@
 package me.nya_n.notificationnotifier
 
 import com.android.build.api.dsl.ApplicationExtension
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
 internal fun Project.configureApplication(
     extension: ApplicationExtension
 ) {
+    configureCommon(extension)
     extension.apply {
-        compileSdk = libs.version("compileSdk").toInt()
         defaultConfig {
-            minSdk = libs.version("minSdk").toInt()
             targetSdk = libs.version("targetSdk").toInt()
             versionCode = libs.version("versionCode").toInt()
             versionName = libs.version("versionName")
-            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         }
         buildTypes {
             release {
@@ -25,9 +22,5 @@ internal fun Project.configureApplication(
                 )
             }
         }
-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
-        }
     }
 }
diff --git a/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Common.kt b/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Common.kt
@@ -0,0 +1,21 @@
+package me.nya_n.notificationnotifier
+
+import com.android.build.api.dsl.CommonExtension
+import org.gradle.api.JavaVersion
+import org.gradle.api.Project
+
+internal fun Project.configureCommon(
+    extension: CommonExtension
+) {
+    extension.apply {
+        compileSdk = libs.version("compileSdk").toInt()
+        defaultConfig.apply {
+            minSdk = libs.version("minSdk").toInt()
+            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        }
+        compileOptions.apply {
+            sourceCompatibility = JavaVersion.VERSION_17
+            targetCompatibility = JavaVersion.VERSION_17
+        }
+    }
+}
diff --git a/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Compose.kt b/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Compose.kt
@@ -4,10 +4,10 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
 
 internal fun Project.configureCompose(
-    extension: CommonExtension<*, *, *, *, *, *>
+    extension: CommonExtension
 ) {
     extension.apply {
-        buildFeatures {
+        buildFeatures.apply {
             compose = true
         }
     }
diff --git a/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Library.kt b/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Library.kt
@@ -1,18 +1,13 @@
 package me.nya_n.notificationnotifier
 
 import com.android.build.api.dsl.LibraryExtension
-import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 
 internal fun Project.configureLibrary(
     extension: LibraryExtension
 ) {
+    configureCommon(extension)
     extension.apply {
-        compileSdk = libs.version("compileSdk").toInt()
-        defaultConfig {
-            minSdk = libs.version("minSdk").toInt()
-            testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        }
         buildTypes {
             release {
                 isMinifyEnabled = false
@@ -22,9 +17,5 @@ internal fun Project.configureLibrary(
                 )
             }
         }
-        compileOptions {
-            sourceCompatibility = JavaVersion.VERSION_17
-            targetCompatibility = JavaVersion.VERSION_17
-        }
     }
 }
diff --git a/AndroidApp/data/repository/build.gradle.kts b/AndroidApp/data/repository/build.gradle.kts
@@ -7,12 +7,6 @@ android {
     namespace = "me.nya_n.notificationnotifier.data.repository"
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-    }
-}
-
 dependencies {
     api(project(":model"))
 
diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ versionName = "1.1"
 # ---------------------------------------------------------
 
 # Library
-agp = "8.13.2"
+agp = "9.0.0"
 kotlin = "2.3.0"
 kotlinx-coroutines = "1.10.2"
 com-google-devtools-ksp = "2.3.4"
diff --git a/AndroidApp/gradle/wrapper/gradle-wrapper.properties b/AndroidApp/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/AndroidApp/model/build.gradle.kts b/AndroidApp/model/build.gradle.kts
@@ -1,26 +1,17 @@
 plugins {
-    id("common.library.compose")
+    id("common.library")
     alias(libs.plugins.com.google.devtools.ksp)
 }
 
 android {
     namespace = "me.nya_n.notificationnotifier.model"
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-    }
-}
-
 dependencies {
     // androidx
     // room
     implementation(libs.androidx.room.runtime)
     ksp(libs.androidx.room.compiler)
-    // compose for @Stable annotation
-    implementation(platform(libs.androidx.compose.bom))
-    api(libs.androidx.compose.runtime)
 
     // その他
     api(libs.com.google.code.gson)
diff --git a/AndroidApp/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts
@@ -1,21 +1,15 @@
 plugins {
     id("common.library.compose")
-    alias(libs.plugins.com.jaredsburrows.license)
+    // note: 最新のgradle/agp非対応
+//    alias(libs.plugins.com.jaredsburrows.license)
     alias(libs.plugins.screenshot)
 }
 
 android {
     namespace = "me.nya_n.notificationnotifier.ui"
-    @Suppress("UnstableApiUsage")
     experimentalProperties["android.experimental.enableScreenshotTest"] = true
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-    }
-}
-
 dependencies {
     implementation(project(":domain"))
 

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,6 @@ android {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-kotlin {`
`20`		`- compilerOptions {`
`21`		`- jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17`
`22`		`- }`
`23`		`-}`
`24`		`-`
`25`	`19`	`dependencies {`
`26`	`20`	`implementation(project(":ui"))`
`27`	`21`	`// diのために必要`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ class CommonApplication : Plugin<Project> {`
`11`	`11`	`with(target) {`
`12`	`12`	`with(pluginManager) {`
`13`	`13`	`apply("com.android.application")`
`14`		`- apply("org.jetbrains.kotlin.android")`
`15`	`14`	`}`
`16`	`15`	`extensions.configure<ApplicationExtension> {`
`17`	`16`	`configureApplication(this)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ class CommonLibrary : Plugin<Project> {`
`11`	`11`	`with(target) {`
`12`	`12`	`with(pluginManager) {`
`13`	`13`	`apply("com.android.library")`
`14`		`- apply("org.jetbrains.kotlin.android")`
`15`	`14`	`}`
`16`	`15`	`extensions.configure<LibraryExtension> {`
`17`	`16`	`configureLibrary(this)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ class CommonLibraryCompose : Plugin<Project> {`
`12`	`12`	`with(target) {`
`13`	`13`	`with(pluginManager) {`
`14`	`14`	`apply("com.android.library")`
`15`		`- apply("org.jetbrains.kotlin.android")`
`16`	`15`	`apply("org.jetbrains.kotlin.plugin.compose")`
`17`	`16`	`}`
`18`	`17`	`extensions.configure<LibraryExtension> {`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,17 @@`
`1`	`1`	`package me.nya_n.notificationnotifier`
`2`	`2`
`3`	`3`	`import com.android.build.api.dsl.ApplicationExtension`
`4`		`-import org.gradle.api.JavaVersion`
`5`	`4`	`import org.gradle.api.Project`
`6`	`5`
`7`	`6`	`internal fun Project.configureApplication(`
`8`	`7`	`extension: ApplicationExtension`
`9`	`8`	`) {`
	`9`	`+ configureCommon(extension)`
`10`	`10`	`extension.apply {`
`11`		`- compileSdk = libs.version("compileSdk").toInt()`
`12`	`11`	`defaultConfig {`
`13`		`- minSdk = libs.version("minSdk").toInt()`
`14`	`12`	`targetSdk = libs.version("targetSdk").toInt()`
`15`	`13`	`versionCode = libs.version("versionCode").toInt()`
`16`	`14`	`versionName = libs.version("versionName")`
`17`		`- testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`18`	`15`	`}`
`19`	`16`	`buildTypes {`
`20`	`17`	`release {`
`@@ -25,9 +22,5 @@ internal fun Project.configureApplication(`
`25`	`22`	`)`
`26`	`23`	`}`
`27`	`24`	`}`
`28`		`- compileOptions {`
`29`		`- sourceCompatibility = JavaVersion.VERSION_17`
`30`		`- targetCompatibility = JavaVersion.VERSION_17`
`31`		`- }`
`32`	`25`	`}`
`33`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,10 @@ import com.android.build.api.dsl.CommonExtension`
`4`	`4`	`import org.gradle.api.Project`
`5`	`5`
`6`	`6`	`internal fun Project.configureCompose(`
`7`		`- extension: CommonExtension<, , , , , >`
	`7`	`+ extension: CommonExtension`
`8`	`8`	`) {`
`9`	`9`	`extension.apply {`
`10`		`- buildFeatures {`
	`10`	`+ buildFeatures.apply {`
`11`	`11`	`compose = true`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,13 @@`
`1`	`1`	`package me.nya_n.notificationnotifier`
`2`	`2`
`3`	`3`	`import com.android.build.api.dsl.LibraryExtension`
`4`		`-import org.gradle.api.JavaVersion`
`5`	`4`	`import org.gradle.api.Project`
`6`	`5`
`7`	`6`	`internal fun Project.configureLibrary(`
`8`	`7`	`extension: LibraryExtension`
`9`	`8`	`) {`
	`9`	`+ configureCommon(extension)`
`10`	`10`	`extension.apply {`
`11`		`- compileSdk = libs.version("compileSdk").toInt()`
`12`		`- defaultConfig {`
`13`		`- minSdk = libs.version("minSdk").toInt()`
`14`		`- testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`15`		`- }`
`16`	`11`	`buildTypes {`
`17`	`12`	`release {`
`18`	`13`	`isMinifyEnabled = false`
`@@ -22,9 +17,5 @@ internal fun Project.configureLibrary(`
`22`	`17`	`)`
`23`	`18`	`}`
`24`	`19`	`}`
`25`		`- compileOptions {`
`26`		`- sourceCompatibility = JavaVersion.VERSION_17`
`27`		`- targetCompatibility = JavaVersion.VERSION_17`
`28`		`- }`
`29`	`20`	`}`
`30`	`21`	`}`