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/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) + ### テスト ###### ユニットテスト 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/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 { 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/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 } } 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 diff --git a/AndroidApp/data/repository/build.gradle.kts b/AndroidApp/data/repository/build.gradle.kts index 3c8ec612..fbf58609 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/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" diff --git a/AndroidApp/gradle/wrapper/gradle-wrapper.properties b/AndroidApp/gradle/wrapper/gradle-wrapper.properties index d4081da4..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-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 index 85cdf1c9..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) } @@ -7,20 +7,11 @@ 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 index 09d06cf6..702551d3 100644 --- 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"))