Skip to content

Commit f9e42d1

Browse files
authored
Merge pull request #61 from cheonjaeung/dependencies
Upgrade Project Dependencies
2 parents 0d3a39b + 1d5ff8a commit f9e42d1

File tree

6 files changed

+22
-18
lines changed

6 files changed

+22
-18
lines changed

gradle/libs.versions.toml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
[versions]
2-
kotlin = "2.1.0"
3-
androidGradlePlugin = "8.10.1"
4-
composeMultiplatform = "1.8.0"
2+
kotlin = "2.2.20"
3+
androidGradlePlugin = "8.13.0"
4+
composeMultiplatform = "1.9.0"
55

66
[plugins]
77
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
88
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
99
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
10-
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.0" }
10+
kotlinx-binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version = "0.18.1" }
1111
android-library = { id = "com.android.library", version.ref = "androidGradlePlugin" }
1212
android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
1313
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
14-
paparazzi = { id = "app.cash.paparazzi", version = "2.0.0-alpha01" }
15-
maven-publish = { id = "com.vanniktech.maven.publish", version = "0.33.0" }
14+
paparazzi = { id = "app.cash.paparazzi", version = "2.0.0-alpha02" }
15+
maven-publish = { id = "com.vanniktech.maven.publish", version = "0.34.0" }
1616

1717
[libraries]
18-
androidx-core = { module = "androidx.core:core", version = "1.16.0" }
18+
androidx-core = { module = "androidx.core:core", version = "1.17.0" }
1919
compose-multiplatform-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "composeMultiplatform" }
2020
compose-multiplatform-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "composeMultiplatform" }
2121
compose-multiplatform-ui-util = { module = "org.jetbrains.compose.ui:ui-util", version.ref = "composeMultiplatform" }
2222

2323
# Sample dependencies
24-
kotlinx-immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.3.7" }
24+
kotlinx-immutable-collections = { module = "org.jetbrains.kotlinx:kotlinx-collections-immutable", version = "0.4.0" }
2525
compose-multiplatform-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "composeMultiplatform" }
26-
compose-multiplatform-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "composeMultiplatform" }
26+
compose-multiplatform-material3 = { module = "org.jetbrains.compose.material3:material3", version = "1.9.0-beta06" }
2727
compose-material-icons-core = { module = "org.jetbrains.compose.material:material-icons-core", version = "1.7.3" }
2828
androidx-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
29-
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.10.1" }
30-
compose-android-runtime = { module = "androidx.compose.runtime:runtime", version = "1.8.0" }
31-
compose-android-foundation = { module = "androidx.compose.foundation:foundation", version = "1.8.0" }
32-
compose-android-ui = { module = "androidx.compose.ui:ui", version = "1.8.0" }
33-
compose-android-material3 = { module = "androidx.compose.material3:material3", version = "1.3.2" }
29+
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.11.0" }
30+
compose-android-runtime = { module = "androidx.compose.runtime:runtime", version = "1.9.2" }
31+
compose-android-foundation = { module = "androidx.compose.foundation:foundation", version = "1.9.2" }
32+
compose-android-ui = { module = "androidx.compose.ui:ui", version = "1.9.2" }
33+
compose-android-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

grid/api/android/grid.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public abstract interface class com/cheonjaeung/compose/grid/BoxGridScope {
2727
public abstract fun position (Landroidx/compose/ui/Modifier;II)Landroidx/compose/ui/Modifier;
2828
public abstract fun row (Landroidx/compose/ui/Modifier;I)Landroidx/compose/ui/Modifier;
2929
public abstract fun span (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
30+
public static synthetic fun span$default (Lcom/cheonjaeung/compose/grid/BoxGridScope;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
3031
}
3132

3233
public final class com/cheonjaeung/compose/grid/BoxGridScope$DefaultImpls {
@@ -58,6 +59,7 @@ public final class com/cheonjaeung/compose/grid/GridKt {
5859
public abstract interface class com/cheonjaeung/compose/grid/GridScope {
5960
public abstract fun align (Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;)Landroidx/compose/ui/Modifier;
6061
public abstract fun span (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
62+
public static synthetic fun span$default (Lcom/cheonjaeung/compose/grid/GridScope;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
6163
}
6264

6365
public final class com/cheonjaeung/compose/grid/GridScope$DefaultImpls {

grid/api/jvm/grid.api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public abstract interface class com/cheonjaeung/compose/grid/BoxGridScope {
2727
public abstract fun position (Landroidx/compose/ui/Modifier;II)Landroidx/compose/ui/Modifier;
2828
public abstract fun row (Landroidx/compose/ui/Modifier;I)Landroidx/compose/ui/Modifier;
2929
public abstract fun span (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
30+
public static synthetic fun span$default (Lcom/cheonjaeung/compose/grid/BoxGridScope;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
3031
}
3132

3233
public final class com/cheonjaeung/compose/grid/BoxGridScope$DefaultImpls {
@@ -58,6 +59,7 @@ public final class com/cheonjaeung/compose/grid/GridKt {
5859
public abstract interface class com/cheonjaeung/compose/grid/GridScope {
5960
public abstract fun align (Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;)Landroidx/compose/ui/Modifier;
6061
public abstract fun span (Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
62+
public static synthetic fun span$default (Lcom/cheonjaeung/compose/grid/GridScope;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Landroidx/compose/ui/Modifier;
6163
}
6264

6365
public final class com/cheonjaeung/compose/grid/GridScope$DefaultImpls {

samples/android/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ plugins {
66

77
android {
88
namespace = "${project.group}.sample.android"
9-
compileSdk = 35
9+
compileSdk = 36
1010

1111
defaultConfig {
1212
applicationId = "${project.group}.sample.android"
1313
minSdk = 21
14-
targetSdk = 35
14+
targetSdk = 36
1515
versionCode = 1
1616
versionName = "${project.version}"
1717
}

samples/shared/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ kotlin {
5353

5454
android {
5555
namespace = "${project.group}.sample.shared"
56-
compileSdk = 35
56+
compileSdk = 36
5757

5858
sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
5959

0 commit comments

Comments
 (0)