Skip to content

Commit 0745d40

Browse files
committed
migrated to kotlin script.
1 parent bf9c8b8 commit 0745d40

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip

library/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ android {
2323
namespace = "io.syslogic.colorpicker"
2424
buildToolsVersion = libs.versions.android.build.tools.get()
2525
compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
26+
2627
defaultConfig {
2728
minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
2829
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -121,8 +122,8 @@ val javadoc by tasks.registering(Javadoc::class) {
121122
source = android.sourceSets.getByName("main").java.getSourceFiles()
122123
configurations["implementation"].isCanBeResolved = true
123124

124-
android.bootClasspath.forEach { classpath += fileTree(it) }
125125
classpath = files(File("${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar"))
126+
android.bootClasspath.forEach { classpath += fileTree(it) }
126127
classpath += fileTree(project.file("build/tmp/aarsToJars/").absolutePath)
127128
classpath += configurations.implementation.get() as FileCollection
128129
isFailOnError = false
@@ -145,7 +146,6 @@ val javadoc by tasks.registering(Javadoc::class) {
145146
configurations["implementation"].files
146147
.filter { it.name.endsWith(".aar") }
147148
.forEach { aar: File ->
148-
// println(aar.name)
149149
copy {
150150
from(zipTree(aar))
151151
include("**/classes.jar")

mobile/build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,13 @@ android {
2323
namespace = "io.syslogic.demo.colorpicker"
2424
buildToolsVersion = libs.versions.android.build.tools.get()
2525
compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
26+
2627
defaultConfig {
28+
applicationId = "io.syslogic.demo.colorpicker"
2729
minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
2830
targetSdk = Integer.parseInt(libs.versions.android.target.sdk.get())
2931
versionCode = Integer.parseInt(libs.versions.app.version.code.get())
3032
versionName = libs.versions.app.version.name.get()
31-
applicationId = "io.syslogic.demo.colorpicker"
3233
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
3334
testBuildType = "debug"
3435
}

0 commit comments

Comments
 (0)