From 6121beb41feea925d87522273be5f9fb5347c8cd Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 01:39:30 +0900 Subject: [PATCH 01/12] gradle 8->9 --- AndroidApp/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 913cd69723d0ffaf386a18c559fb0b0fe003840f Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 01:39:43 +0900 Subject: [PATCH 02/12] agp 8->9 --- 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 4da20ba6..a36a4208 100644 --- 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" From 1458a4cbc7b7e10cb84e812d704b688b84d69688 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 01:40:37 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9Fkotlin-android=E3=81=AE=E5=87=A6=E7=90=86?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/build-logic/src/main/kotlin/CommonApplication.kt | 1 - AndroidApp/build-logic/src/main/kotlin/CommonLibrary.kt | 1 - AndroidApp/build-logic/src/main/kotlin/CommonLibraryCompose.kt | 1 - 3 files changed, 3 deletions(-) diff --git a/AndroidApp/build-logic/src/main/kotlin/CommonApplication.kt b/AndroidApp/build-logic/src/main/kotlin/CommonApplication.kt index ff56a3be..2aa4303c 100644 --- 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 { with(target) { with(pluginManager) { apply("com.android.application") - apply("org.jetbrains.kotlin.android") } extensions.configure { configureApplication(this) diff --git a/AndroidApp/build-logic/src/main/kotlin/CommonLibrary.kt b/AndroidApp/build-logic/src/main/kotlin/CommonLibrary.kt index dad0bb9c..fde040dd 100644 --- 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 { with(target) { with(pluginManager) { apply("com.android.library") - apply("org.jetbrains.kotlin.android") } extensions.configure { configureLibrary(this) diff --git a/AndroidApp/build-logic/src/main/kotlin/CommonLibraryCompose.kt b/AndroidApp/build-logic/src/main/kotlin/CommonLibraryCompose.kt index f6c05bc0..ac35c003 100644 --- 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 { with(target) { with(pluginManager) { apply("com.android.library") - apply("org.jetbrains.kotlin.android") apply("org.jetbrains.kotlin.plugin.compose") } extensions.configure { From 435155e58d14211474ca0be24df2f088e5eac323 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 01:42:09 +0900 Subject: [PATCH 04/12] =?UTF-8?q?compose=E7=94=A8=E3=81=AEconfigure?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/me/nya_n/notificationnotifier/Compose.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index c4f39b35..1079b6e0 100644 --- 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 } } From 03f41799f357436ca11cf81fb0a2999dc9789c04 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 01:43:11 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=E9=9D=9E=E5=AF=BE=E5=BF=9C=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/.idea/kotlinc.xml | 2 +- AndroidApp/ui/build.gradle.kts | 3 ++- 2 files changed, 3 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/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts index 09d06cf6..ecea0322 100644 --- a/AndroidApp/ui/build.gradle.kts +++ b/AndroidApp/ui/build.gradle.kts @@ -1,6 +1,7 @@ plugins { id("common.library.compose") - alias(libs.plugins.com.jaredsburrows.license) + // note: 最新のgradle/agp非対応 +// alias(libs.plugins.com.jaredsburrows.license) alias(libs.plugins.screenshot) } From e88df44a37c61dc5d9837ae1925ee58b90f526bc Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 01:45:21 +0900 Subject: [PATCH 06/12] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E3=81=AB?= =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E3=81=AE=E3=81=A7repository?= =?UTF-8?q?=E5=B1=A4=E3=81=ABcomposeBom=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/data/repository/build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AndroidApp/data/repository/build.gradle.kts b/AndroidApp/data/repository/build.gradle.kts index 3c8ec612..93cb485d 100644 --- a/AndroidApp/data/repository/build.gradle.kts +++ b/AndroidApp/data/repository/build.gradle.kts @@ -23,6 +23,10 @@ dependencies { api(libs.androidx.room.runtime) ksp(libs.androidx.room.compiler) + // FIXME: なぜか必要と言われるので追加しておく。どっかでcompose使ってたっけ...？ + val composeBom = platform(libs.androidx.compose.bom) + implementation(composeBom) + // test androidTestImplementation(libs.junit) androidTestImplementation(libs.com.google.truth) From ae8ceb0ab290e14f43a5946de7b29929fac748d4 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 02:01:45 +0900 Subject: [PATCH 07/12] =?UTF-8?q?Application=E3=81=A8Library=E3=81=AE?= =?UTF-8?q?=E5=85=B1=E9=80=9A=E5=87=A6=E7=90=86=E3=81=BE=E3=81=A8=E3=82=81?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nya_n/notificationnotifier/Application.kt | 9 +------- .../me/nya_n/notificationnotifier/Common.kt | 21 +++++++++++++++++++ .../me/nya_n/notificationnotifier/Library.kt | 11 +--------- 3 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Common.kt 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 index 4d110136..1417e3b0 100644 --- 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 - } } } \ No newline at end of file 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 new file mode 100644 index 00000000..5c24d4ea --- /dev/null +++ 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/Library.kt b/AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Library.kt index e4620d19..b4ae2f10 100644 --- 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 - } } } \ No newline at end of file From 4285d71a257850c76836cc117fdc485a8a62021e Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 02:28:18 +0900 Subject: [PATCH 08/12] =?UTF-8?q?gradle=209.1=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidApp/gradle/wrapper/gradle-wrapper.properties b/AndroidApp/gradle/wrapper/gradle-wrapper.properties index 19a6bdeb..2e111328 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-9.3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 4f362a30e33ce5096329d95241bd0de123e9ca55 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 02:46:59 +0900 Subject: [PATCH 09/12] =?UTF-8?q?README=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/AndroidApp/README.md b/AndroidApp/README.md index d636cd94..205624a8 100644 --- 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) + ### テスト ###### ユニットテスト From ef33fd592edd69ab514d19e432039ba41b0928f4 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 03:32:54 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/app/build.gradle.kts | 6 ------ AndroidApp/data/repository/build.gradle.kts | 6 ------ AndroidApp/model/build.gradle.kts | 6 ------ AndroidApp/ui/build.gradle.kts | 6 ------ 4 files changed, 24 deletions(-) diff --git a/AndroidApp/app/build.gradle.kts b/AndroidApp/app/build.gradle.kts index aed5359d..cf3c389e 100644 --- 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/data/repository/build.gradle.kts b/AndroidApp/data/repository/build.gradle.kts index 93cb485d..cf862f21 100644 --- 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/model/build.gradle.kts b/AndroidApp/model/build.gradle.kts index 85cdf1c9..495b7979 100644 --- a/AndroidApp/model/build.gradle.kts +++ b/AndroidApp/model/build.gradle.kts @@ -7,12 +7,6 @@ android { namespace = "me.nya_n.notificationnotifier.model" } -kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 - } -} - dependencies { // androidx // room diff --git a/AndroidApp/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts index ecea0322..bfe362ef 100644 --- a/AndroidApp/ui/build.gradle.kts +++ b/AndroidApp/ui/build.gradle.kts @@ -11,12 +11,6 @@ android { experimentalProperties["android.experimental.enableScreenshotTest"] = true } -kotlin { - compilerOptions { - jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 - } -} - dependencies { implementation(project(":domain")) From faf70b993a5802d6d522dc56af31997d7405e0b1 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 03:34:50 +0900 Subject: [PATCH 11/12] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9FSuppress=E6=8C=87=E5=AE=9A=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/ui/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/AndroidApp/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts index bfe362ef..702551d3 100644 --- a/AndroidApp/ui/build.gradle.kts +++ b/AndroidApp/ui/build.gradle.kts @@ -7,7 +7,6 @@ plugins { android { namespace = "me.nya_n.notificationnotifier.ui" - @Suppress("UnstableApiUsage") experimentalProperties["android.experimental.enableScreenshotTest"] = true } From 380dca8a48ee2d846c3bdfd32cfa9433fc8e6783 Mon Sep 17 00:00:00 2001 From: Takuya Nishizawa Date: Tue, 20 Jan 2026 03:44:45 +0900 Subject: [PATCH 12/12] =?UTF-8?q?compose=E3=81=AE=E4=BE=9D=E5=AD=98?= =?UTF-8?q?=E8=A6=8B=E7=9B=B4=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AndroidApp/data/repository/build.gradle.kts | 4 ---- AndroidApp/model/build.gradle.kts | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/AndroidApp/data/repository/build.gradle.kts b/AndroidApp/data/repository/build.gradle.kts index cf862f21..fbf58609 100644 --- a/AndroidApp/data/repository/build.gradle.kts +++ b/AndroidApp/data/repository/build.gradle.kts @@ -17,10 +17,6 @@ dependencies { api(libs.androidx.room.runtime) ksp(libs.androidx.room.compiler) - // FIXME: なぜか必要と言われるので追加しておく。どっかでcompose使ってたっけ...？ - val composeBom = platform(libs.androidx.compose.bom) - implementation(composeBom) - // test androidTestImplementation(libs.junit) androidTestImplementation(libs.com.google.truth) diff --git a/AndroidApp/model/build.gradle.kts b/AndroidApp/model/build.gradle.kts index 495b7979..f84e64b1 100644 --- a/AndroidApp/model/build.gradle.kts +++ b/AndroidApp/model/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("common.library.compose") + id("common.library") alias(libs.plugins.com.google.devtools.ksp) } @@ -12,9 +12,6 @@ dependencies { // 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)