From bb23662eddf989cf1df96225765e425c989e8103 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Sun, 18 Jan 2026 21:13:50 +0900 Subject: [PATCH 1/6] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml index 098b780c..8702d69d 100644 --- a/AndroidApp/gradle/libs.versions.toml +++ b/AndroidApp/gradle/libs.versions.toml @@ -13,14 +13,14 @@ versionName = "1.1" agp = "8.9.3" kotlin = "2.2.21" 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" From b1da64c380cc9f33700e654133b336d310394ccd Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Sun, 18 Jan 2026 21:39:53 +0900 Subject: [PATCH 2/6] =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9?= =?UTF-8?q?=E3=83=AA=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml index 8702d69d..acfcaa93 100644 --- a/AndroidApp/gradle/libs.versions.toml +++ b/AndroidApp/gradle/libs.versions.toml @@ -23,7 +23,7 @@ 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" From 96e4c8793e8ca6cdac241b744104fddd2b584226 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Sun, 18 Jan 2026 21:43:11 +0900 Subject: [PATCH 3/6] =?UTF-8?q?agp=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml index acfcaa93..8724e865 100644 --- a/AndroidApp/gradle/libs.versions.toml +++ b/AndroidApp/gradle/libs.versions.toml @@ -10,7 +10,7 @@ versionName = "1.1" # --------------------------------------------------------- # Library -agp = "8.9.3" +agp = "8.13.2" kotlin = "2.2.21" kotlinx-coroutines = "1.10.2" com-google-devtools-ksp = "2.3.4" From d0e42e65696ae5b1850d9468d31bcc7dc01610d9 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Sun, 18 Jan 2026 22:03:29 +0900 Subject: [PATCH 4/6] =?UTF-8?q?kotlin=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/app/build.gradle.kts | 7 +++++-- AndroidApp/data/repository/build.gradle.kts | 6 ++++-- AndroidApp/domain/build.gradle.kts | 6 ++++-- AndroidApp/gradle/libs.versions.toml | 2 +- AndroidApp/model/build.gradle.kts | 6 ++++-- AndroidApp/ui/build.gradle.kts | 6 ++++-- 6 files changed, 22 insertions(+), 11 deletions(-) diff --git a/AndroidApp/app/build.gradle.kts b/AndroidApp/app/build.gradle.kts index dfb2da1f..aed5359d 100644 --- a/AndroidApp/app/build.gradle.kts +++ b/AndroidApp/app/build.gradle.kts @@ -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 } } diff --git a/AndroidApp/data/repository/build.gradle.kts b/AndroidApp/data/repository/build.gradle.kts index 58e4edd7..3c8ec612 100644 --- a/AndroidApp/data/repository/build.gradle.kts +++ b/AndroidApp/data/repository/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 } } diff --git a/AndroidApp/domain/build.gradle.kts b/AndroidApp/domain/build.gradle.kts index 175f61be..8a33d83c 100644 --- a/AndroidApp/domain/build.gradle.kts +++ b/AndroidApp/domain/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 } } diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml index 8724e865..aee2f9ff 100644 --- a/AndroidApp/gradle/libs.versions.toml +++ b/AndroidApp/gradle/libs.versions.toml @@ -11,7 +11,7 @@ versionName = "1.1" # Library agp = "8.13.2" -kotlin = "2.2.21" +kotlin = "2.3.0" kotlinx-coroutines = "1.10.2" com-google-devtools-ksp = "2.3.4" com-jaredsburrows-license = "0.9.8" diff --git a/AndroidApp/model/build.gradle.kts b/AndroidApp/model/build.gradle.kts index 7f899747..85cdf1c9 100644 --- a/AndroidApp/model/build.gradle.kts +++ b/AndroidApp/model/build.gradle.kts @@ -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 } } diff --git a/AndroidApp/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts index 81bba17c..e84e9941 100644 --- a/AndroidApp/ui/build.gradle.kts +++ b/AndroidApp/ui/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 } } From 535d91631e4a9ed7ac679dee549f12a0433fc8aa Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Sun, 18 Jan 2026 22:12:02 +0900 Subject: [PATCH 5/6] =?UTF-8?q?gradle=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/.idea/kotlinc.xml | 2 +- AndroidApp/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidApp/.idea/kotlinc.xml b/AndroidApp/.idea/kotlinc.xml index c224ad56..8ad8c861 100644 --- a/AndroidApp/.idea/kotlinc.xml +++ b/AndroidApp/.idea/kotlinc.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/AndroidApp/gradle/wrapper/gradle-wrapper.properties b/AndroidApp/gradle/wrapper/gradle-wrapper.properties index d4081da4..19a6bdeb 100644 --- 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.3.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From bbd8d8f6a71b553d31d96a533554b6271a231b8a Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Sun, 18 Jan 2026 22:27:56 +0900 Subject: [PATCH 6/6] failOnNoDiscoveredTests = false --- AndroidApp/ui/build.gradle.kts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AndroidApp/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts index e84e9941..3781b729 100644 --- a/AndroidApp/ui/build.gradle.kts +++ b/AndroidApp/ui/build.gradle.kts @@ -34,4 +34,9 @@ dependencies { // その他 implementation(libs.io.insert.koin) implementation(libs.io.insert.koin.compose) +} + +tasks.withType().configureEach { + // FIXME: ScreenshotTestを全部コメントアウトしてるので一時的にfalseにしておく + failOnNoDiscoveredTests = false } \ No newline at end of file