Skip to content

Commit 4cb3fe6

Browse files
authored
Merge pull request #179 from joreilly/dependency_updates
dependency updates
2 parents 6b1c555 + f6c8781 commit 4cb3fe6

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

androidApp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ android {
3636
}
3737

3838
dependencies {
39-
implementation(project(":shared"))
39+
implementation(projects.shared)
4040

4141

4242
implementation(libs.androidx.activity.compose)

compose-web/build.gradle.kts

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

4141
implementation(libs.androidx.navigation.compose)
4242
implementation(libs.compose.window.size)
43-
implementation(project(":shared"))
43+
implementation(projects.shared)
4444
}
4545
}
4646
}

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ kotlin = "2.0.20"
33
ksp = "2.0.20-1.0.25"
44
kotlinx-coroutines = "1.9.0"
55

6-
androidGradlePlugin = "8.4.2"
6+
androidGradlePlugin = "8.7.0"
77
koin = "4.0.0"
88
koinComposeMultiplatform = "4.0.0"
99
apollo = "4.0.0"
1010
kmpNativeCoroutines = "1.0.0-ALPHA-35"
1111

1212
androidxActivity = "1.9.2"
13-
androidxComposeBom = "2024.09.02"
13+
androidxComposeBom = "2024.09.03"
1414
androidx-navigation = "2.8.0-alpha08"
1515
androidx-lifecycle = "2.8.2"
1616
accompanist = "0.30.1"
1717
horologist = "0.6.20"
1818
wearCompose = "1.4.0"
19-
composeMultiplatform = "1.7.0-beta02"
19+
composeMultiplatform = "1.7.0-rc01"
2020
composeWindowSize = "0.5.0"
2121

2222
junit = "4.13.2"
@@ -80,6 +80,6 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
8080
kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
8181
apollo = { id = "com.apollographql.apollo", version.ref = "apollo" }
8282
kmpNativeCoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "kmpNativeCoroutines" }
83-
dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version = "1.25.0" }
83+
dependency-analysis = { id = "com.autonomousapps.dependency-analysis", version = "1.33.0" }
8484
jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "composeMultiplatform" }
8585
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

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.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

server/build.gradle.kts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
plugins {
22
kotlin("multiplatform")
3-
id("org.jetbrains.kotlin.plugin.spring").version("1.9.20")
4-
id("org.jetbrains.kotlin.plugin.serialization").version("1.9.20")
5-
id("org.springframework.boot").version("3.2.5")
6-
//id("com.google.cloud.tools.appengine").version("2.4.2")
3+
id("org.jetbrains.kotlin.plugin.spring").version("2.0.20")
4+
id("org.jetbrains.kotlin.plugin.serialization").version("2.0.20")
5+
id("org.springframework.boot").version("3.3.4")
76
}
87

98

@@ -15,9 +14,9 @@ kotlin {
1514
sourceSets {
1615
val jvmMain by getting {
1716
dependencies {
18-
implementation("com.expediagroup:graphql-kotlin-spring-server:7.1.1")
19-
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.5.0")
20-
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
17+
implementation("com.expediagroup:graphql-kotlin-spring-server:7.1.4")
18+
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
19+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
2120

2221
//testImplementation("com.squareup.okhttp3:okhttp:4.11.0")
2322
}

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pluginManagement {
1717
}
1818
}
1919

20+
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
2021

2122
rootProject.name = "StarWarsKMM"
2223

wearApp/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
4949

5050

5151
dependencies {
52-
implementation(project(":shared"))
52+
implementation(projects.shared)
5353

5454
implementation(platform(libs.androidx.compose.bom))
5555
implementation(libs.androidx.compose.foundation)

0 commit comments

Comments
 (0)