Skip to content

Commit 825ccf9

Browse files
committed
update dependencies
1 parent b819426 commit 825ccf9

File tree

5 files changed

+24
-22
lines changed

5 files changed

+24
-22
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,17 @@ plugins {
77

88
android {
99
namespace = "at.connyduck.sparkbutton.sample"
10-
compileSdk = 34
10+
compileSdk = 36
1111

1212
defaultConfig {
1313
applicationId = "at.connyduck.sparkbutton.sample"
1414
minSdk = 21
15-
targetSdk = 34
15+
targetSdk = 36
1616
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1717
}
1818
lint {
1919
abortOnError = false
2020
}
21-
compileOptions {
22-
sourceCompatibility = JavaVersion.VERSION_17
23-
targetCompatibility = JavaVersion.VERSION_17
24-
}
2521
buildFeatures {
2622
compose = true
2723
}

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ android.defaults.buildfeatures.buildconfig=false
1212
android.defaults.buildfeatures.renderscript=false
1313
android.defaults.buildfeatures.resvalues=false
1414
android.defaults.buildfeatures.shaders=false
15-
android.nonTransitiveRClass=true
15+
android.nonTransitiveRClass=true
16+
17+
org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
22
agp = "8.11.0"
3-
androidxActivityCompose = "1.9.0"
4-
androidxAppcompat = "1.7.0"
5-
androidxCompose = "1.6.8"
6-
androidxCore = "1.13.1"
7-
composeBom = "2024.06.00"
8-
dokka = "1.9.20"
9-
kotlin = "2.0.0"
10-
ktlint = "12.1.1"
3+
androidxActivityCompose = "1.10.1"
4+
androidxAppcompat = "1.7.1"
5+
androidxCompose = "1.8.3"
6+
androidxCore = "1.16.0"
7+
composeBom = "2025.06.01"
8+
dokka = "2.0.0"
9+
kotlin = "2.2.0"
10+
ktlint = "12.3.0"
1111
publishPlugin = "2.0.0"
1212

1313
[plugins]

sparkbutton-compose/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
2+
13
plugins {
24
kotlin("android")
35
id("com.android.library")
@@ -36,15 +38,15 @@ android {
3638
buildFeatures {
3739
compose = true
3840
}
39-
kotlinOptions {
40-
freeCompilerArgs += "-Xexplicit-api=strict"
41+
kotlin {
42+
explicitApi = ExplicitApiMode.Strict
4143
}
4244
}
4345

4446
val javadocJar by tasks.registering(Jar::class) {
45-
dependsOn(tasks.dokkaHtml)
47+
dependsOn(tasks.dokkaGenerate)
4648
archiveClassifier.set("javadoc")
47-
from(tasks.dokkaHtml.get().outputDirectory.get())
49+
from(tasks.dokkaGeneratePublicationHtml.flatMap { it.outputDirectory })
4850
}
4951

5052
afterEvaluate {

sparkbutton/build.gradle.kts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
android {
88
namespace = "at.connyduck.sparkbutton"
99

10-
compileSdk = 34
10+
compileSdk = 36
1111

1212
defaultConfig {
1313
minSdk = 19
@@ -20,13 +20,15 @@ android {
2020
lint {
2121
abortOnError = false
2222
}
23-
2423
publishing {
2524
singleVariant("release") {
2625
withSourcesJar()
2726
withJavadocJar()
2827
}
2928
}
29+
java {
30+
sourceCompatibility = JavaVersion.VERSION_17
31+
}
3032
}
3133

3234
afterEvaluate {
@@ -80,4 +82,4 @@ signing {
8082

8183
dependencies {
8284
implementation(libs.androidx.appcompat)
83-
}
85+
}

0 commit comments

Comments
 (0)