Merge pull request #306 from ptkNktq/update/env

ライブラリ/環境の更新

Author: ptkNktq

AndroidApp/.idea/kotlinc.xml

@@ -14,8 +14,11 @@ android {
     packaging {
         resources.excludes.add("META-INF/DEPENDENCIES")
     }
-    kotlinOptions {
-        jvmTarget = "17"
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
     }
 }
 

AndroidApp/app/build.gradle.kts

@@ -5,9 +5,11 @@ plugins {
 
 android {
     namespace = "me.nya_n.notificationnotifier.data.repository"
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
     }
 }
 

AndroidApp/data/repository/build.gradle.kts

@@ -4,9 +4,11 @@ plugins {
 
 android {
     namespace = "me.nya_n.notificationnotifier.domain"
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
     }
 }
 

AndroidApp/domain/build.gradle.kts

@@ -10,20 +10,20 @@ versionName = "1.1"
 # ---------------------------------------------------------
 
 # Library
-agp = "8.9.3"
-kotlin = "2.2.21"
+agp = "8.13.2"
+kotlin = "2.3.0"
 kotlinx-coroutines = "1.10.2"
-com-google-devtools-ksp = "2.3.3" # Kotlinのバージョンに合わせる必要がある
+com-google-devtools-ksp = "2.3.4"
 com-jaredsburrows-license = "0.9.8"
 androidx-core = "1.17.0"
 androidx-appcompat = "1.7.1"
 androidx-security = "1.1.0"
 androidx-splashscreen = "1.2.0"
-androidx-compose-bom = "2025.12.00"
-androidx-compose-activity = "1.12.1"
+androidx-compose-bom = "2026.01.00"
+androidx-compose-activity = "1.12.2"
 androidx-compose-viewmodel = "2.10.0"
 androidx-compose-navigation = "2.9.6"
-androidx-compose-screenshot = "0.0.1-alpha09"
+androidx-compose-screenshot = "0.0.1-alpha13"
 junit = "4.13.2"
 com-google-truth = "1.4.5"
 androidx-test-ext = "1.3.0"

AndroidApp/gradle/libs.versions.toml

@@ -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.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

AndroidApp/gradle/wrapper/gradle-wrapper.properties

@@ -5,9 +5,11 @@ plugins {
 
 android {
     namespace = "me.nya_n.notificationnotifier.model"
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
     }
 }
 

AndroidApp/model/build.gradle.kts

@@ -8,9 +8,11 @@ android {
     namespace = "me.nya_n.notificationnotifier.ui"
     @Suppress("UnstableApiUsage")
     experimentalProperties["android.experimental.enableScreenshotTest"] = true
+}
 
-    kotlinOptions {
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
     }
 }
 
@@ -32,4 +34,9 @@ dependencies {
     // その他
     implementation(libs.io.insert.koin)
     implementation(libs.io.insert.koin.compose)
+}
+
+tasks.withType<Test>().configureEach {
+    // FIXME: ScreenshotTestを全部コメントアウトしてるので一時的にfalseにしておく
+    failOnNoDiscoveredTests = false
 }