Skip to content

Commit ed9ce09

Browse files
authored
Merge pull request #424 from joreilly/dependency_updates
dependency updates
2 parents c0ec2ec + f3d3e02 commit ed9ce09

File tree

17 files changed

+27
-157
lines changed

17 files changed

+27
-157
lines changed

.github/workflows/android.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: pull_request
55
jobs:
66
build:
77

8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99

1010
steps:
1111
- uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
2727

2828

2929
androidTest:
30-
runs-on: macos-13
30+
runs-on: ubuntu-24.04
3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@v3

.github/workflows/wearos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: pull_request
55
jobs:
66

77
wearOSTest:
8-
runs-on: macos-13
8+
runs-on: macos-14
99
steps:
1010
- name: Checkout
1111
uses: actions/checkout@v3

.github/workflows/web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: pull_request
55
jobs:
66
build:
77

8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99

1010
steps:
1111
- uses: actions/checkout@v3

README.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,6 @@ Have tested this out in Google App Engine deployment. Using shadowJar plugin to
8181
gcloud app deploy backend/build/libs/backend-all.jar --appyaml=backend/src/jvmMain/appengine/app.yaml
8282
```
8383

84-
### GraphQL backend
85-
86-
There's a GraphQL module (`graphql-server`) which can be run locally using `./gradlew :graphql-server:bootRun` with "playground" then available at http://localhost:8080/playground
87-
88-
8984

9085
### Screenshots
9186

backend/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ kotlin {
2222
implementation(libs.kotlinx.coroutines)
2323
implementation(libs.kotlinx.serialization)
2424

25-
implementation("io.ktor:ktor-server-core:3.2.1")
26-
implementation("io.ktor:ktor-server-netty:3.2.1")
27-
implementation("io.ktor:ktor-server-cors:3.2.1")
28-
implementation("io.ktor:ktor-serialization-kotlinx-json:3.2.1")
29-
implementation("io.ktor:ktor-server-content-negotiation:3.2.1")
25+
implementation("io.ktor:ktor-server-core:3.2.3")
26+
implementation("io.ktor:ktor-server-netty:3.2.3")
27+
implementation("io.ktor:ktor-server-cors:3.2.3")
28+
implementation("io.ktor:ktor-serialization-kotlinx-json:3.2.3")
29+
implementation("io.ktor:ktor-server-content-negotiation:3.2.3")
3030

31-
implementation("ch.qos.logback:logback-classic:1.5.8")
31+
implementation("ch.qos.logback:logback-classic:1.5.18")
3232

3333
implementation(projects.common)
3434
}

compose-web/build.gradle.kts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,3 @@ kotlin {
4040
}
4141

4242

43-
compose.experimental {
44-
web.application {}
45-
}

gradle.properties

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
org.gradle.jvmargs=-Xmx4000m -XX:+UseParallelGC
1+
org.gradle.jvmargs=-Xmx3072M -Dfile.encoding=UTF-8 -XX:+UseParallelGC
22
android.useAndroidX=true
3-
android.enableJetifier=false
3+
org.gradle.parallel=true
4+
org.gradle.caching=true
5+
org.gradle.configureondemand=true
6+
org.gradle.daemon=true
7+
org.gradle.unsafe.configuration-cache=true
48

59
# XCode
610
xcodeproj=./ios/PeopleInSpaceSwiftUI

gradle/libs.versions.toml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[versions]
2-
kotlin = "2.2.0"
3-
ksp = "2.2.0-2.0.2"
2+
kotlin = "2.2.10"
3+
ksp = "2.2.10-2.0.2"
44

55
compose-multiplatform = "1.8.2"
66
composeUiTooling = "1.4.1"
77
coroutines = "1.10.2"
88
kotlinxSerialization = "1.9.0"
9-
androidGradlePlugin = "8.12.0"
9+
androidGradlePlugin = "8.12.1"
1010
koin = "4.1.0"
1111
koinCompose = "4.1.0"
1212
koinComposeMultiplatform = "4.1.0"
@@ -20,14 +20,14 @@ webPackPlugin = "9.1.0"
2020

2121

2222
androidxActivity = "1.10.1"
23-
androidxComposeBom = "2025.07.00"
23+
androidxComposeBom = "2025.08.00"
2424
material3-adaptive = "1.1.0"
2525
material3-adaptive-navigation-suite = "1.3.2"
2626
androidxNavigationCompose = "2.9.3"
27-
uiToolingPreview = "1.8.3"
27+
uiToolingPreview = "1.9.0"
2828
wearCompose = "1.4.1"
2929
androidxLifecycle = "2.9.2"
30-
androidxLifecycleKMP = "2.9.1"
30+
androidxLifecycleKMP = "2.9.2"
3131

3232
coilCompose = "2.7.0"
3333
coilCompose3 = "3.3.0"
@@ -36,11 +36,11 @@ horologist = "0.6.23"
3636
glanceWearTiles = "1.0.0-alpha05"
3737
glanceAppWidget = "1.1.1"
3838
okhttp = "5.1.0"
39-
kermit = "2.0.6"
39+
kermit = "2.0.8"
4040

4141
gradleVersionsPlugin = "0.52.0"
42-
shadowPlugin = "9.0.0-rc3"
43-
skie = "0.10.5"
42+
shadowPlugin = "9.0.2"
43+
skie = "0.10.6"
4444

4545
mcp = "0.6.0"
4646

@@ -82,10 +82,10 @@ androidx-lifecycle-viewmodel-kmp = { module = "org.jetbrains.androidx.lifecycle:
8282
androidx-lifecycle-compose-kmp = { module = "org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycleKMP" }
8383

8484

85-
androidx-tracing = "androidx.tracing:tracing:1.2.0"
85+
androidx-tracing = "androidx.tracing:tracing:1.3.0"
8686

8787
splash-screen = "androidx.core:core-splashscreen:1.0.1"
88-
metrics = "androidx.metrics:metrics-performance:1.0.0-beta01"
88+
metrics = "androidx.metrics:metrics-performance:1.0.0-beta02"
8989

9090
osmdroidAndroid = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroidAndroid" }
9191
osm-android-compose = { module = "tech.utsmankece:osm-android-compose", version.ref = "osmAndroidCompose" }

graphql-server/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

graphql-server/build.gradle.kts

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)