Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: pull_request
jobs:
build:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3
Expand All @@ -27,7 +27,7 @@ jobs:


androidTest:
runs-on: macos-13
runs-on: ubuntu-24.04
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/wearos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: pull_request
jobs:

wearOSTest:
runs-on: macos-13
runs-on: macos-14
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: pull_request
jobs:
build:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3
Expand Down
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ Have tested this out in Google App Engine deployment. Using shadowJar plugin to
gcloud app deploy backend/build/libs/backend-all.jar --appyaml=backend/src/jvmMain/appengine/app.yaml
```

### GraphQL backend

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



### Screenshots

Expand Down
12 changes: 6 additions & 6 deletions backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ kotlin {
implementation(libs.kotlinx.coroutines)
implementation(libs.kotlinx.serialization)

implementation("io.ktor:ktor-server-core:3.2.1")
implementation("io.ktor:ktor-server-netty:3.2.1")
implementation("io.ktor:ktor-server-cors:3.2.1")
implementation("io.ktor:ktor-serialization-kotlinx-json:3.2.1")
implementation("io.ktor:ktor-server-content-negotiation:3.2.1")
implementation("io.ktor:ktor-server-core:3.2.3")
implementation("io.ktor:ktor-server-netty:3.2.3")
implementation("io.ktor:ktor-server-cors:3.2.3")
implementation("io.ktor:ktor-serialization-kotlinx-json:3.2.3")
implementation("io.ktor:ktor-server-content-negotiation:3.2.3")

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

implementation(projects.common)
}
Expand Down
3 changes: 0 additions & 3 deletions compose-web/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,3 @@ kotlin {
}


compose.experimental {
web.application {}
}
8 changes: 6 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
org.gradle.jvmargs=-Xmx4000m -XX:+UseParallelGC
org.gradle.jvmargs=-Xmx3072M -Dfile.encoding=UTF-8 -XX:+UseParallelGC
android.useAndroidX=true
android.enableJetifier=false
org.gradle.parallel=true
org.gradle.caching=true
org.gradle.configureondemand=true
org.gradle.daemon=true
org.gradle.unsafe.configuration-cache=true

# XCode
xcodeproj=./ios/PeopleInSpaceSwiftUI
Expand Down
22 changes: 11 additions & 11 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[versions]
kotlin = "2.2.0"
ksp = "2.2.0-2.0.2"
kotlin = "2.2.10"
ksp = "2.2.10-2.0.2"

compose-multiplatform = "1.8.2"
composeUiTooling = "1.4.1"
coroutines = "1.10.2"
kotlinxSerialization = "1.9.0"
androidGradlePlugin = "8.12.0"
androidGradlePlugin = "8.12.1"
koin = "4.1.0"
koinCompose = "4.1.0"
koinComposeMultiplatform = "4.1.0"
Expand All @@ -20,14 +20,14 @@ webPackPlugin = "9.1.0"


androidxActivity = "1.10.1"
androidxComposeBom = "2025.07.00"
androidxComposeBom = "2025.08.00"
material3-adaptive = "1.1.0"
material3-adaptive-navigation-suite = "1.3.2"
androidxNavigationCompose = "2.9.3"
uiToolingPreview = "1.8.3"
uiToolingPreview = "1.9.0"
wearCompose = "1.4.1"
androidxLifecycle = "2.9.2"
androidxLifecycleKMP = "2.9.1"
androidxLifecycleKMP = "2.9.2"

coilCompose = "2.7.0"
coilCompose3 = "3.3.0"
Expand All @@ -36,11 +36,11 @@ horologist = "0.6.23"
glanceWearTiles = "1.0.0-alpha05"
glanceAppWidget = "1.1.1"
okhttp = "5.1.0"
kermit = "2.0.6"
kermit = "2.0.8"

gradleVersionsPlugin = "0.52.0"
shadowPlugin = "9.0.0-rc3"
skie = "0.10.5"
shadowPlugin = "9.0.2"
skie = "0.10.6"

mcp = "0.6.0"

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


androidx-tracing = "androidx.tracing:tracing:1.2.0"
androidx-tracing = "androidx.tracing:tracing:1.3.0"

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

osmdroidAndroid = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroidAndroid" }
osm-android-compose = { module = "tech.utsmankece:osm-android-compose", version.ref = "osmAndroidCompose" }
Expand Down
1 change: 0 additions & 1 deletion graphql-server/.gitignore

This file was deleted.

41 changes: 0 additions & 41 deletions graphql-server/build.gradle.kts

This file was deleted.

3 changes: 0 additions & 3 deletions graphql-server/src/jvmMain/appengine/app.yaml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions graphql-server/src/jvmMain/resources/application.yml

This file was deleted.

1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ include(":compose-desktop")
include(":compose-web")
include(":common")
include(":backend")
include(":graphql-server")
include(":mcp-server")