Skip to content

Commit 64e0da5

Browse files
authored
Merge pull request #9 from infinum/housekeeping/dependency-update-mar-2026
Dependency update March 2026
2 parents d2b3499 + 40a8b69 commit 64e0da5

7 files changed

Lines changed: 28 additions & 21 deletions

File tree

config.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extra["buildConfig"] = mapOf(
22
"minSdk" to 28,
3-
"compileSdk" to 34,
4-
"targetSdk" to 34
3+
"compileSdk" to 36,
4+
"targetSdk" to 36
55
)
66

77
extra["releaseConfig"] = mapOf(

dokka.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
apply plugin: "org.jetbrains.dokka"
22

3-
tasks.named("dokkaJavadoc") {
4-
outputDirectory.set(file("$buildDir/javadoc"))
3+
dokka {
4+
dokkaPublications.named("html") {
5+
outputDirectory.set(project.layout.buildDirectory.dir("javadoc"))
6+
}
57

68
dokkaSourceSets {
79
named("main") {

gradle/libs.versions.toml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
[versions]
2-
activityCompose = "1.9.2"
3-
androidGradlePlugin = "8.2.2"
4-
appcompat = "1.7.0"
5-
compose = "1.7.8"
6-
coreKtx = "1.13.1"
7-
detekt = "1.23.6"
8-
dokka = "1.9.10"
9-
kotlin = "2.0.20"
10-
material3Android = "1.3.1"
2+
activityCompose = "1.12.4"
3+
androidGradlePlugin = "8.13.2"
4+
appcompat = "1.7.1"
5+
compose = "1.10.4"
6+
composeIcons = "1.7.8"
7+
coreKtx = "1.17.0"
8+
detekt = "1.23.8"
9+
dokka = "2.1.0"
10+
kotlin = "2.3.10"
11+
material3Android = "1.4.0"
1112

1213
[plugins]
1314
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -20,6 +21,7 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2021
androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
2122
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
2223
androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
24+
androidx-material-icons-core = { module = "androidx.compose.material:material-icons-core", version.ref = "composeIcons" }
2325
androidx-material3-android = { module = "androidx.compose.material3:material3-android", version.ref = "material3Android" }
2426
compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
2527
compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Jan 02 14:24:44 CET 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

maven-publish.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ apply plugin: "signing"
33

44
// Dokka is optional but recommended.
55
// Sonatype will not accept a published artifact without at least an empty Javadoc JAR.
6-
task javadocsJar(type: Jar, dependsOn: "dokkaJavadoc") {
6+
task javadocsJar(type: Jar, dependsOn: "dokkaGenerate") {
77
getArchiveClassifier().set("javadoc")
8-
from dokkaJavadoc.outputDirectory
8+
from layout.buildDirectory.dir("javadoc")
99
}
1010

1111
task sourcesJar(type: Jar) {

sample/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ android {
3838
sourceCompatibility = JavaVersion.VERSION_17
3939
targetCompatibility = JavaVersion.VERSION_17
4040
}
41-
kotlinOptions {
42-
jvmTarget = "17"
41+
kotlin {
42+
compilerOptions {
43+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
44+
}
4345
}
4446
buildFeatures {
4547
compose = true

snacky/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ android {
3535
sourceCompatibility = JavaVersion.VERSION_17
3636
targetCompatibility = JavaVersion.VERSION_17
3737
}
38-
kotlinOptions {
39-
jvmTarget = "17"
40-
}
4138
kotlin {
39+
compilerOptions {
40+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
41+
}
4242
explicitApi()
4343
}
4444
}
@@ -69,5 +69,6 @@ extra["mavenPublishProperties"] = mapOf(
6969
dependencies {
7070

7171
implementation(libs.androidx.core.ktx)
72+
implementation(libs.androidx.material.icons.core)
7273
implementation(libs.androidx.material3.android)
7374
}

0 commit comments

Comments
 (0)