Merge pull request #192 from joreilly/dep_updates

dependency updates/cleanup

Author: joreilly

.graphqlconfig

@@ -1,6 +1,6 @@
 # StarWars
 
-![kotlin-version](https://img.shields.io/badge/kotlin-2.1.0-blue?logo=kotlin)
+![kotlin-version](https://img.shields.io/badge/kotlin-2.2.0-blue?logo=kotlin)
 
 Minimal GraphQL based Jetpack Compose, Wear Compose and SwiftUI Kotlin Multiplatform sample (using StarWars endpoint - https://graphql.org/swapi-graphql).
 Makes use of [Apollo](https://github.com/apollographql/apollo-android) library and in particular

README.md

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id("com.android.application")
     kotlin("android")
@@ -49,7 +51,6 @@ dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.tooling)
     implementation(libs.androidx.navigation.compose)
-    implementation(libs.accompanist.insets)
     implementation(libs.androidx.compose.material3)
 
     implementation(libs.koin.core)
@@ -65,6 +66,6 @@ dependencies {
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-    kotlinOptions.jvmTarget = "17"
+    compilerOptions.jvmTarget.set(JvmTarget.JVM_17)
 }
 

androidApp/build.gradle.kts

@@ -27,7 +27,7 @@ class StarWarsUITest {
         people.forEachIndexed { index, person ->
             val rowNode = personListNode.onChildAt(index).onChild()
             rowNode.assertTextContains(person.name)
-            rowNode.assertTextContains(person.homeworld.name)
+            rowNode.assertTextContains(person.homeworld?.name ?: "")
         }
     }
 

androidApp/src/androidTest/java/dev/johnoreilly/starwars/androidApp/StarWarsUITest.kt

@@ -167,7 +167,7 @@ fun PersonView(person: PersonFragment) {
                 },
                 supportingContent = {
                     Text(
-                        person.homeworld.name,
+                        person.homeworld?.name ?: "",
                         style = MaterialTheme.typography.titleMedium,
                         color = Color.DarkGray
                     )

androidApp/src/main/java/dev/johnoreilly/starwars/androidApp/MainActivity.kt

@@ -12,7 +12,6 @@ version = "1.0-SNAPSHOT"
 @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
 kotlin {
     wasmJs {
-        moduleName = "StarWars"
         browser {
             commonWebpackConfig {
                 outputFileName = "StarWars.js"

compose-web/build.gradle.kts

@@ -1,31 +1,30 @@
 [versions]
-kotlin = "2.1.0"
-ksp = "2.1.0-1.0.29"
-kotlinx-coroutines = "1.9.0"
-
-androidGradlePlugin = "8.7.3"
-koin = "4.0.0"
-koinComposeMultiplatform = "4.0.0"
-apollo = "4.1.0"
-apolloMockServer = "0.1.0"
-kmpNativeCoroutines = "1.0.0-ALPHA-38"
-
-androidxActivity = "1.9.3"
-androidxComposeBom = "2024.12.01"
-androidx-navigation = "2.8.0-alpha08"
-androidx-lifecycle = "2.8.4"
-accompanist = "0.30.1"
-horologist = "0.6.20"
-wearCompose = "1.4.0"
-composeMultiplatform = "1.7.3"
+kotlin = "2.2.0"
+ksp = "2.1.21-2.0.1"
+kotlinx-coroutines = "1.10.2"
+
+androidGradlePlugin = "8.11.0"
+koin = "4.1.0"
+koinComposeMultiplatform = "4.1.0"
+apollo = "4.3.1"
+apolloMockServer = "0.1.1"
+kmpNativeCoroutines = "1.0.0-ALPHA-45"
+
+androidxActivity = "1.10.1"
+androidxComposeBom = "2025.06.01"
+androidx-navigation = "2.8.0-alpha13"
+androidx-lifecycle = "2.9.1"
+horologist = "0.6.23"
+wearCompose = "1.4.1"
+composeMultiplatform = "1.8.2"
 composeWindowSize = "0.5.0"
 
 junit = "4.13.2"
 
 minSdk = "24"
 minWearSdk = "28"
-targetSdk = "34"
-compileSdk = "34"
+targetSdk = "35"
+compileSdk = "35"
 
 
 
@@ -50,10 +49,6 @@ androidx-compose-material3 = { group = "androidx.compose.material3", name = "mat
 androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 androidx-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
 
-accompanist-insets = { group = "com.google.accompanist", name = "accompanist-insets", version.ref = "accompanist" }
-accompanist-pager = { group = "com.google.accompanist", name = "accompanist-pager", version.ref = "accompanist" }
-accompanist-pagerIndicator = { group = "com.google.accompanist", name = "accompanist-pager-indicators", version.ref = "accompanist" }
-
 androidx-wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearCompose" }
 androidx-wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearCompose" }
 androidx-wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "wearCompose" }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -42,7 +42,7 @@ struct PersonView: View {
     var body: some View {
         VStack(alignment: .leading) {
             Text(person.name).font(.headline)
-            Text(person.homeworld.name).font(.subheadline)
+            Text(person.homeworld?.name ?? "").font(.subheadline)
         }
     }
 }

iosApp/iosApp/ContentView.swift

@@ -80,7 +80,7 @@ apollo {
         generateSchema.set(true)
         generateDataBuilders.set(true)
         introspection {
-            endpointUrl.set("https://swapi-graphql.netlify.app/.netlify/functions/index")
+            endpointUrl.set("https://swapi-graphql.netlify.app/graphql")
             schemaFile.set(file("src/commonMain/graphql/schema.graphqls"))
         }
     }