Skip to content

Commit aae6db4

Browse files
ptkNktqptkNktq
authored
Merge pull request #310 from ptkNktq/fix/license
Fix/license
2 parents ef12633 + 2331f11 commit aae6db4

15 files changed

Lines changed: 238 additions & 994 deletions

File tree

‎AndroidApp/.idea/kotlinc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AndroidApp/app/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id("common.android")
3+
alias(libs.plugins.about.libraries)
34
}
45

56
android {
@@ -26,4 +27,5 @@ dependencies {
2627
// その他
2728
implementation(libs.io.insert.koin)
2829
debugImplementation(libs.com.squareup.leakcanary.android)
30+
implementation(libs.about.libraries.core)
2931
}

‎AndroidApp/app/licenses.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎AndroidApp/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ plugins {
44
alias(libs.plugins.org.jetbrains.kotlin.android) apply false
55
alias(libs.plugins.compose.compiler) apply false
66
alias(libs.plugins.com.google.devtools.ksp) apply false
7-
alias(libs.plugins.com.jaredsburrows.license) apply false
7+
alias(libs.plugins.about.libraries) apply false
88
}

‎AndroidApp/gradle/libs.versions.toml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ agp = "9.0.0"
1414
kotlin = "2.3.0"
1515
kotlinx-coroutines = "1.10.2"
1616
com-google-devtools-ksp = "2.3.4"
17-
com-jaredsburrows-license = "0.9.8"
1817
androidx-core = "1.17.0"
1918
androidx-appcompat = "1.7.1"
2019
androidx-security = "1.1.0"
@@ -33,15 +32,16 @@ io-insert-koin = "4.1.1"
3332
com-google-code-gson = "2.13.2"
3433
com-squareup-leakcanary = "2.14"
3534
mockk = "1.14.7"
35+
about-libraries = "14.0.0-b01"
3636

3737
[plugins]
3838
com-android-application = { id = "com.android.application", version.ref = "agp" }
3939
com-android-library = { id = "com.android.library", version.ref = "agp" }
4040
org-jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
4141
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
4242
com-google-devtools-ksp = { id = "com.google.devtools.ksp", version.ref = "com-google-devtools-ksp" }
43-
com-jaredsburrows-license = { id = "com.jaredsburrows.license", version.ref = "com-jaredsburrows-license" }
4443
screenshot = { id = "com.android.compose.screenshot", version.ref = "androidx-compose-screenshot" }
44+
about-libraries = { id = "com.mikepenz.aboutlibraries.plugin.android", version.ref = "about-libraries" }
4545

4646
[libraries]
4747
# androidx
@@ -77,10 +77,16 @@ screenshot-validation-api = { group = "com.android.tools.screenshot", name = "sc
7777
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
7878

7979
# その他
80+
com-google-code-gson = { module = "com.google.code.gson:gson", version.ref = "com-google-code-gson" }
81+
# DI
8082
io-insert-koin = { module = "io.insert-koin:koin-android", version.ref = "io-insert-koin" }
8183
io-insert-koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "io-insert-koin" }
82-
com-google-code-gson = { module = "com.google.code.gson:gson", version.ref = "com-google-code-gson" }
84+
# analyze
8385
com-squareup-leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "com-squareup-leakcanary" }
86+
# license
87+
about-libraries-core = { module = "com.mikepenz:aboutlibraries-core", version.ref = "about-libraries" }
88+
about-libraries-compose-core = { module = "com.mikepenz:aboutlibraries-compose-core", version.ref = "about-libraries" }
89+
about-libraries-compose-m3 = { module = "com.mikepenz:aboutlibraries-compose-m3", version.ref = "about-libraries" }
8490

8591
[bundles]
8692
androidx-compose = [

‎AndroidApp/ui/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
plugins {
22
id("common.library.compose")
3-
// note: 最新のgradle/agp非対応
4-
// alias(libs.plugins.com.jaredsburrows.license)
53
alias(libs.plugins.screenshot)
64
}
75

@@ -29,4 +27,6 @@ dependencies {
2927
// その他
3028
implementation(libs.io.insert.koin)
3129
implementation(libs.io.insert.koin.compose)
30+
implementation(libs.about.libraries.compose.core)
31+
implementation(libs.about.libraries.compose.m3)
3232
}

‎AndroidApp/ui/build/reports/screenshotTest/preview/debug/index.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ <h1>Test Summary</h1>
1919
<tr>
2020
<td>
2121
<div class="infoBox" id="tests">
22-
<div class="counter">16</div>
22+
<div class="counter">17</div>
2323
<p>tests</p>
2424
</div>
2525
</td>
@@ -43,7 +43,7 @@ <h1>Test Summary</h1>
4343
</td>
4444
<td>
4545
<div class="infoBox" id="duration">
46-
<div class="counter">3.154s</div>
46+
<div class="counter">3.747s</div>
4747
<p>duration</p>
4848
</div>
4949
</td>
@@ -88,11 +88,11 @@ <h2>Packages</h2>
8888
<td class="success">
8989
<a href="me.nya_n.notificationnotifier.html">me.nya_n.notificationnotifier</a>
9090
</td>
91-
<td>16</td>
91+
<td>17</td>
9292
<td>0</td>
9393
<td>0</td>
9494
<td>0</td>
95-
<td>3.154s</td>
95+
<td>3.747s</td>
9696
<td class="success">100%</td>
9797
</tr>
9898
</tbody>
@@ -120,17 +120,17 @@ <h2>Classes</h2>
120120
<td>0</td>
121121
<td>0</td>
122122
<td>0</td>
123-
<td>1.615s</td>
123+
<td>1.931s</td>
124124
<td class="success">100%</td>
125125
</tr>
126126
<tr>
127127
<td class="success"/>
128128
<a href="me.nya_n.notificationnotifier.ContentScreenshotTest.html">me.nya_n.notificationnotifier.ContentScreenshotTest</a>
129-
<td>5</td>
129+
<td>6</td>
130130
<td>0</td>
131131
<td>0</td>
132132
<td>0</td>
133-
<td>1.539s</td>
133+
<td>1.816s</td>
134134
<td class="success">100%</td>
135135
</tr>
136136
</tbody>
@@ -139,7 +139,7 @@ <h2>Classes</h2>
139139
</div>
140140
<div id="footer">
141141
<p>Generated by
142-
<a href="http://www.gradle.org">Gradle 8.14.3</a> at Jan 19, 2026, 11:38:47 PM</p>
142+
<a href="http://www.gradle.org">Gradle 9.1.0</a> at Jan 21, 2026, 12:05:22 AM</p>
143143
</div>
144144
</div>
145145
</body>

‎AndroidApp/ui/build/reports/screenshotTest/preview/debug/me.nya_n.notificationnotifier.ComponentScreenshotTest.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1>Class me.nya_n.notificationnotifier.ComponentScreenshotTest</h1>
4646
</td>
4747
<td>
4848
<div class="infoBox" id="duration">
49-
<div class="counter">1.615s</div>
49+
<div class="counter">1.931s</div>
5050
<p>duration</p>
5151
</div>
5252
</td>
@@ -361,7 +361,7 @@ <h3 class="success">TopBarComponentScreenshotTest</h3>
361361
</div>
362362
<div id="footer">
363363
<p>Generated by
364-
<a href="http://www.gradle.org">Gradle 8.14.3</a> at Jan 19, 2026, 11:38:47 PM</p>
364+
<a href="http://www.gradle.org">Gradle 9.1.0</a> at Jan 21, 2026, 12:05:22 AM</p>
365365
</div>
366366
</div>
367367
</body>

‎AndroidApp/ui/build/reports/screenshotTest/preview/debug/me.nya_n.notificationnotifier.ContentScreenshotTest.html‎

Lines changed: 31 additions & 5 deletions
Large diffs are not rendered by default.

‎AndroidApp/ui/build/reports/screenshotTest/preview/debug/me.nya_n.notificationnotifier.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ <h1>Package me.nya_n.notificationnotifier</h1>
2121
<tr>
2222
<td>
2323
<div class="infoBox" id="tests">
24-
<div class="counter">16</div>
24+
<div class="counter">17</div>
2525
<p>tests</p>
2626
</div>
2727
</td>
@@ -45,7 +45,7 @@ <h1>Package me.nya_n.notificationnotifier</h1>
4545
</td>
4646
<td>
4747
<div class="infoBox" id="duration">
48-
<div class="counter">3.154s</div>
48+
<div class="counter">3.747s</div>
4949
<p>duration</p>
5050
</div>
5151
</td>
@@ -90,26 +90,26 @@ <h2>Classes</h2>
9090
<td>0</td>
9191
<td>0</td>
9292
<td>0</td>
93-
<td>1.615s</td>
93+
<td>1.931s</td>
9494
<td class="success">100%</td>
9595
</tr>
9696
<tr>
9797
<td class="success">
9898
<a href="me.nya_n.notificationnotifier.ContentScreenshotTest.html">ContentScreenshotTest</a>
9999
</td>
100-
<td>5</td>
100+
<td>6</td>
101101
<td>0</td>
102102
<td>0</td>
103103
<td>0</td>
104-
<td>1.539s</td>
104+
<td>1.816s</td>
105105
<td class="success">100%</td>
106106
</tr>
107107
</table>
108108
</div>
109109
</div>
110110
<div id="footer">
111111
<p>Generated by
112-
<a href="http://www.gradle.org">Gradle 8.14.3</a> at Jan 19, 2026, 11:38:47 PM</p>
112+
<a href="http://www.gradle.org">Gradle 9.1.0</a> at Jan 21, 2026, 12:05:22 AM</p>
113113
</div>
114114
</div>
115115
</body>

0 commit comments

Comments
 (0)