diff --git a/AndroidApp/.idea/kotlinc.xml b/AndroidApp/.idea/kotlinc.xml
index 8ad8c861..03fcfb7b 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/app/build.gradle.kts b/AndroidApp/app/build.gradle.kts
index cf3c389e..f57641e8 100644
--- a/AndroidApp/app/build.gradle.kts
+++ b/AndroidApp/app/build.gradle.kts
@@ -1,5 +1,6 @@
plugins {
id("common.android")
+ alias(libs.plugins.about.libraries)
}
android {
@@ -26,4 +27,5 @@ dependencies {
// その他
implementation(libs.io.insert.koin)
debugImplementation(libs.com.squareup.leakcanary.android)
+ implementation(libs.about.libraries.core)
}
\ No newline at end of file
diff --git a/AndroidApp/app/licenses.yml b/AndroidApp/app/licenses.yml
deleted file mode 100644
index a869d172..00000000
--- a/AndroidApp/app/licenses.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- artifact: io.insert-koin:koin-android:+
- name: koin-android
- copyrightHolder: Arnaud GIULIANI, Laurent BARESSE
- license: The Apache Software License, Version 2.0
- licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
- url: https://insert-koin.io/
-- artifact: com.google.code.gson:gson:+
- name: gson
- copyrightHolder: Google Inc.
- license: The Apache Software License, Version 2.0
- licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
- url: https://github.com/google/gson
diff --git a/AndroidApp/build.gradle.kts b/AndroidApp/build.gradle.kts
index db0d8c00..9c2e7bff 100644
--- a/AndroidApp/build.gradle.kts
+++ b/AndroidApp/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
alias(libs.plugins.org.jetbrains.kotlin.android) apply false
alias(libs.plugins.compose.compiler) apply false
alias(libs.plugins.com.google.devtools.ksp) apply false
- alias(libs.plugins.com.jaredsburrows.license) apply false
+ alias(libs.plugins.about.libraries) apply false
}
diff --git a/AndroidApp/gradle/libs.versions.toml b/AndroidApp/gradle/libs.versions.toml
index a36a4208..6f844e73 100644
--- a/AndroidApp/gradle/libs.versions.toml
+++ b/AndroidApp/gradle/libs.versions.toml
@@ -14,7 +14,6 @@ agp = "9.0.0"
kotlin = "2.3.0"
kotlinx-coroutines = "1.10.2"
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"
@@ -33,6 +32,7 @@ io-insert-koin = "4.1.1"
com-google-code-gson = "2.13.2"
com-squareup-leakcanary = "2.14"
mockk = "1.14.7"
+about-libraries = "14.0.0-b01"
[plugins]
com-android-application = { id = "com.android.application", version.ref = "agp" }
@@ -40,8 +40,8 @@ com-android-library = { id = "com.android.library", version.ref = "agp" }
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "com-google-devtools-ksp" }
-com-jaredsburrows-license = { id = "com.jaredsburrows.license", version.ref = "com-jaredsburrows-license" }
screenshot = { id = "com.android.compose.screenshot", version.ref = "androidx-compose-screenshot" }
+about-libraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "about-libraries" }
[libraries]
# androidx
@@ -77,10 +77,16 @@ screenshot-validation-api = { group = "com.android.tools.screenshot", name = "sc
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
# その他
+com-google-code-gson = { module = "com.google.code.gson:gson", version.ref = "com-google-code-gson" }
+# DI
io-insert-koin = { module = "io.insert-koin:koin-android", version.ref = "io-insert-koin" }
io-insert-koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "io-insert-koin" }
-com-google-code-gson = { module = "com.google.code.gson:gson", version.ref = "com-google-code-gson" }
+# analyze
com-squareup-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "com-squareup-leakcanary" }
+# license
+about-libraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "about-libraries" }
+about-libraries-compose-core = { module = "com.mikepenz:aboutlibraries-compose-core", version.ref = "about-libraries" }
+about-libraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "about-libraries" }
[bundles]
androidx-compose = [
diff --git a/AndroidApp/ui/build.gradle.kts b/AndroidApp/ui/build.gradle.kts
index 702551d3..5fef9d62 100644
--- a/AndroidApp/ui/build.gradle.kts
+++ b/AndroidApp/ui/build.gradle.kts
@@ -1,7 +1,5 @@
plugins {
id("common.library.compose")
- // note: 最新のgradle/agp非対応
-// alias(libs.plugins.com.jaredsburrows.license)
alias(libs.plugins.screenshot)
}
@@ -29,4 +27,6 @@ dependencies {
// その他
implementation(libs.io.insert.koin)
implementation(libs.io.insert.koin.compose)
+ implementation(libs.about.libraries.compose.core)
+ implementation(libs.about.libraries.compose.m3)
}
diff --git a/AndroidApp/ui/build/reports/screenshotTest/preview/debug/index.html b/AndroidApp/ui/build/reports/screenshotTest/preview/debug/index.html
index 39dd0577..88644a28 100644
--- a/AndroidApp/ui/build/reports/screenshotTest/preview/debug/index.html
+++ b/AndroidApp/ui/build/reports/screenshotTest/preview/debug/index.html
@@ -19,7 +19,7 @@ Test Summary
@@ -43,7 +43,7 @@ Test Summary
@@ -88,11 +88,11 @@ Packages
me.nya_n.notificationnotifier
-16
+17
0
0
0
-3.154s
+3.747s
100%
@@ -120,17 +120,17 @@ Classes
0
0
0
-1.615s
+1.931s
100%
me.nya_n.notificationnotifier.ContentScreenshotTest
-5
+6
0
0
0
-1.539s
+1.816s
100%
@@ -139,7 +139,7 @@ Classes
\ No newline at end of file
diff --git a/AndroidApp/ui/build/reports/screenshotTest/preview/debug/me.nya_n.notificationnotifier.ComponentScreenshotTest.html b/AndroidApp/ui/build/reports/screenshotTest/preview/debug/me.nya_n.notificationnotifier.ComponentScreenshotTest.html
index f02cbc13..bfa77071 100644
--- a/AndroidApp/ui/build/reports/screenshotTest/preview/debug/me.nya_n.notificationnotifier.ComponentScreenshotTest.html
+++ b/AndroidApp/ui/build/reports/screenshotTest/preview/debug/me.nya_n.notificationnotifier.ComponentScreenshotTest.html
@@ -46,7 +46,7 @@