Skip to content

Commit 94a5d17

Browse files
committed
migrated to kotlin script.
1 parent bf9c8b8 commit 94a5d17

File tree

5 files changed

+26
-28
lines changed

5 files changed

+26
-28
lines changed

.github/FUNDING.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
custom: ["https://www.paypal.me/syslogic"]
2-
github: [syslogic]
1+
custom: ["https://litecoinspace.org/address/ltc1q05w9amjznfytcuw8ve7d7dy2ec3y762ps55u35", "https://www.paypal.me/syslogic"]
2+
github: ["syslogic"]

gradle/libs.versions.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ android_target_sdk = '36'
77
android_min_sdk = '21'
88

99
# Gradle Plugins
10-
android_gradle_plugin = '8.10.0'
10+
android_gradle_plugin = '8.12.0'
1111
material_design = '1.12.0'
1212
junit = '4.13.2'
13-
kotlin = '2.1.21'
13+
kotlin = '2.2.0'
1414

15-
androidx_compose_bom = '2025.05.01'
16-
androidx_compose_uitest = '1.8.2'
15+
androidx_compose_bom = '2025.07.00'
16+
androidx_compose_uitest = '1.8.3'
1717
androidx_core = '1.16.0'
18-
androidx_appcompat = '1.7.0'
19-
androidx_navigation = '2.9.0'
18+
androidx_appcompat = '1.7.1'
19+
androidx_navigation = '2.9.3'
2020
androidx_preference = '1.2.1'
2121

22-
androidx_test_ext_junit = '1.2.1'
23-
androidx_test_core = '1.6.1'
24-
androidx_test_rules = '1.6.1'
25-
androidx_test_runner = '1.6.2'
26-
androidx_test_monitor = '1.7.2'
27-
androidx_test_espresso = '3.6.1'
22+
androidx_test_ext_junit = '1.3.0'
23+
androidx_test_core = '1.7.0'
24+
androidx_test_rules = '1.7.0'
25+
androidx_test_runner = '1.7.0'
26+
androidx_test_monitor = '1.8.0'
27+
androidx_test_espresso = '3.7.0'
2828
androidx_test_uiautomator = '2.3.0'
2929

3030
[plugins]
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Wed May 12 04:51:24 CEST 2021
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip

library/build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
// Module :library
24
plugins {
35
alias(libs.plugins.android.library)
@@ -9,6 +11,7 @@ plugins {
911

1012
kotlin {
1113
compilerOptions {
14+
jvmTarget = JvmTarget.JVM_17
1215
freeCompilerArgs.addAll(
1316
listOf("-Xlint:unchecked", "-Xlint:deprecation")
1417
)
@@ -23,6 +26,7 @@ android {
2326
namespace = "io.syslogic.colorpicker"
2427
buildToolsVersion = libs.versions.android.build.tools.get()
2528
compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
29+
2630
defaultConfig {
2731
minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
2832
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -42,10 +46,6 @@ android {
4246
targetCompatibility = JavaVersion.VERSION_17
4347
}
4448

45-
kotlinOptions {
46-
jvmTarget = "17"
47-
}
48-
4949
composeCompiler {
5050
reportsDestination = layout.buildDirectory.dir("compose_compiler")
5151
}
@@ -121,8 +121,8 @@ val javadoc by tasks.registering(Javadoc::class) {
121121
source = android.sourceSets.getByName("main").java.getSourceFiles()
122122
configurations["implementation"].isCanBeResolved = true
123123

124-
android.bootClasspath.forEach { classpath += fileTree(it) }
125124
classpath = files(File("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"))
125+
android.bootClasspath.forEach { classpath += fileTree(it) }
126126
classpath += fileTree(project.file("build/tmp/aarsToJars/").absolutePath)
127127
classpath += configurations.implementation.get() as FileCollection
128128
isFailOnError = false
@@ -136,7 +136,7 @@ val javadoc by tasks.registering(Javadoc::class) {
136136
(options as StandardJavadocDocletOptions).linkSource(true)
137137
(options as StandardJavadocDocletOptions).author(true)
138138

139-
setDestinationDir(project.file("build/outputs/javadoc"))
139+
destinationDir = project.file("build/outputs/javadoc")
140140
exclude("**/BuildConfig.java", "**/R.java", "**/*.kt")
141141

142142
doFirst {
@@ -145,7 +145,6 @@ val javadoc by tasks.registering(Javadoc::class) {
145145
configurations["implementation"].files
146146
.filter { it.name.endsWith(".aar") }
147147
.forEach { aar: File ->
148-
// println(aar.name)
149148
copy {
150149
from(zipTree(aar))
151150
include("**/classes.jar")

mobile/build.gradle.kts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
// Module :mobile
24
plugins {
35
alias(libs.plugins.android.application)
@@ -9,6 +11,7 @@ plugins {
911

1012
kotlin {
1113
compilerOptions {
14+
jvmTarget = JvmTarget.JVM_17
1215
freeCompilerArgs.addAll(
1316
listOf("-Xlint:unchecked", "-Xlint:deprecation")
1417
)
@@ -23,20 +26,17 @@ android {
2326
namespace = "io.syslogic.demo.colorpicker"
2427
buildToolsVersion = libs.versions.android.build.tools.get()
2528
compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
29+
2630
defaultConfig {
31+
applicationId = "io.syslogic.demo.colorpicker"
2732
minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
2833
targetSdk = Integer.parseInt(libs.versions.android.target.sdk.get())
2934
versionCode = Integer.parseInt(libs.versions.app.version.code.get())
3035
versionName = libs.versions.app.version.name.get()
31-
applicationId = "io.syslogic.demo.colorpicker"
3236
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3337
testBuildType = "debug"
3438
}
3539

36-
kotlinOptions {
37-
jvmTarget = "17"
38-
}
39-
4040
composeCompiler {
4141
reportsDestination = layout.buildDirectory.dir("compose_compiler")
4242
// stabilityConfigurationFile = rootProject.layout.projectDirectory.file("stability_config.conf")

0 commit comments

Comments
 (0)