Merge pull request #279 from ptkNktq/update/libs

ライブラリの更新

Author: ptkNktq

AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Application.kt

@@ -8,12 +8,12 @@ internal fun Project.configureApplication(
     extension: ApplicationExtension
 ) {
     extension.apply {
-        compileSdk = 35
+        compileSdk = libs.version("compileSdk").toInt()
         defaultConfig {
-            minSdk = 30
-            targetSdk = 35
-            versionCode = 2
-            versionName = "1.1"
+            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 {

AndroidApp/build-logic/src/main/kotlin/me/nya_n/notificationnotifier/Library.kt

@@ -8,9 +8,9 @@ internal fun Project.configureLibrary(
     extension: LibraryExtension
 ) {
     extension.apply {
-        compileSdk = 35
+        compileSdk = libs.version("compileSdk").toInt()
         defaultConfig {
-            minSdk = 30
+            minSdk = libs.version("minSdk").toInt()
             testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         }
         buildTypes {

AndroidApp/gradle/libs.versions.toml

@@ -1,22 +1,33 @@
 [versions]
-agp = "8.9.1"
+# --- memo: unusedになっているがbuild-logic内から参照している ---
+# Android Sdk Versions
+compileSdk = "35"
+minSdk = "35"
+targetSdk = "35"
+# App Versions
+versionCode = "2"
+versionName = "1.1"
+# ---------------------------------------------------------
+
+# Library
+agp = "8.9.3"
 kotlin = "2.1.20"
 com-google-devtools-ksp = "2.1.20-2.0.1" # Kotlinのバージョンに合わせる必要がある
 com-jaredsburrows-license = "0.9.8"
 androidx-core = "1.16.0"
 androidx-appcompat = "1.7.1"
 androidx-security = "1.1.0-beta01"
 androidx-splashscreen = "1.0.1"
-androidx-compose-bom = "2025.06.00"
+androidx-compose-bom = "2025.06.01"
 androidx-compose-activity = "1.10.1"
 androidx-compose-viewmodel = "2.9.1"
-androidx-compose-navigation = "2.9.0"
+androidx-compose-navigation = "2.9.1"
 androidx-compose-screenshot = "0.0.1-alpha09"
 junit = "4.13.2"
 com-google-truth = "1.4.4"
 androidx-test-ext = "1.2.1"
 androidx-test-espresso = "3.6.1"
-androidx-room = "2.7.1"
+androidx-room = "2.7.2"
 io-insert-koin = "4.1.0"
 com-google-code-gson = "2.13.1"
 com-squareup-leakcanary = "2.14"

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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

AndroidApp/model/build.gradle.kts

@@ -23,6 +23,3 @@ dependencies {
     // その他
     api(libs.com.google.code.gson)
 }
-
-val Project.catalog
-    get(): VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")