dependency updates

joreilly · Sep 17, 2023 · 82a848c · 82a848c
1 parent 158c3f7
commit 82a848c
Show file tree

Hide file tree

Showing 18 changed files with 126 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ Have tested this out in Google App Engine deployment.  Using shadowJar plugin to
 
 ```
 ./gradlew :backend:shadowJar
-gcloud app deploy backend/build/libs/backend-all.jar cloud app deploy backend/build/libs/backend-all.jar --appyaml=backend/src/main/appengine/app.yaml
+gcloud app deploy backend/build/libs/backend-all.jar --appyaml=backend/src/jvmMain/appengine/app.yaml
 ```
 
 ### GraphQL backend

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -1,31 +1,40 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-    id("kotlin-platform-jvm")
+    kotlin("multiplatform")
     application
     kotlin("plugin.serialization")
     id("com.github.johnrengelman.shadow")
 }
 
-dependencies {
-    with(Deps.Kotlinx) {
-        implementation(serializationCore) // JVM dependency
-        implementation(coroutinesCore)
-    }
 
-    with(Deps.Ktor) {
-        implementation(serverCore)
-        implementation(serverNetty)
-        implementation(serverCors)
-        implementation(serverContentNegotiation)
-        implementation(json)
+kotlin {
+    jvm() {
+        withJava()
     }
 
-    with(Deps.Log) {
-        implementation(logback)
-    }
+    sourceSets {
+        val jvmMain by getting {
+            dependencies {
+                with(Deps.Kotlinx) {
+                    implementation(serializationCore) // JVM dependency
+                    implementation(coroutinesCore)
+                }
 
-    implementation(project(":common"))
+                with(Deps.Ktor) {
+                    implementation(serverCore)
+                    implementation(serverNetty)
+                    implementation(serverCors)
+                    implementation(serverContentNegotiation)
+                    implementation(json)
+                }
+
+                with(Deps.Log) {
+                    implementation(logback)
+                }
+
+                implementation(project(":common"))
+            }
+        }
+    }
 }
 
 application {

diff --git a/backend/src/main/appengine/.gcloudignore → backend/src/jvmMain/appengine/.gcloudignore b/backend/src/main/appengine/.gcloudignore → backend/src/jvmMain/appengine/.gcloudignore
diff --git a/backend/src/main/appengine/app.yaml → backend/src/jvmMain/appengine/app.yaml b/backend/src/main/appengine/app.yaml → backend/src/jvmMain/appengine/app.yaml
diff --git a/backend/src/main/kotlin/PeopleData.kt → backend/src/jvmMain/kotlin/PeopleData.kt b/backend/src/main/kotlin/PeopleData.kt → backend/src/jvmMain/kotlin/PeopleData.kt
@@ -65,13 +65,13 @@ val personImages = mapOf(
     "Sultan Alneyadi" to "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f9/SpaceX-Crew-6_Sultan-Alneyadi-MBRSC-scaled.jpg/440px-SpaceX-Crew-6_Sultan-Alneyadi-MBRSC-scaled.jpg",
     "Andrey Fedyaev" to "https://upload.wikimedia.org/wikipedia/commons/thumb/1/1d/SpaceX_crew_6_image_5.png/440px-SpaceX_crew_6_image_5.png",
     "Jing Haiping" to "https://upload.wikimedia.org/wikipedia/commons/thumb/e/ef/Jing_Haipeng.JPG/440px-Jing_Haipeng.JPG",
-    "Gui Haichow" to "",
+    "Gui Haichow" to "https://upload.wikimedia.org/wikipedia/commons/thumb/2/21/Gui_Haichao_2023_Space_Station.jpg/440px-Gui_Haichao_2023_Space_Station.jpg",
     "Zhu Yangzhu" to "https://upload.wikimedia.org/wikipedia/commons/6/68/Zhu_Yangzhu_Shenzhou_16_%E6%9C%B1%E6%9D%A8%E6%9F%B1_20230530_01.jpg",
 
     "Jasmin Moghbeli" to "https://upload.wikimedia.org/wikipedia/commons/thumb/d/dc/Jasmin_Moghbeli_official_portrait.jpg/440px-Jasmin_Moghbeli_official_portrait.jpg",
     "Andreas Mogensen" to "https://upload.wikimedia.org/wikipedia/commons/thumb/f/f0/Andreas_Mogensen_official_portrait.jpg/400px-Andreas_Mogensen_official_portrait.jpg",
     "Satoshi Furukawa" to "https://upload.wikimedia.org/wikipedia/commons/thumb/3/39/Satoshi_Furukawa_%28cropped%29.jpg/440px-Satoshi_Furukawa_%28cropped%29.jpg",
-    "Konstantin Borisov" to "https://upload.wikimedia.org/wikipedia/commons/2/25/Konstantin_Borisov.jpg",
+    "Konstantin Borisov" to "https://www.esa.int/var/esa/storage/images/esa_multimedia/images/2023/06/this_is_konstantin_borisov/24930040-1-eng-GB/This_is_Konstantin_Borisov.jpg",
 )
 
 val personBios = mapOf(

diff --git a/backend/src/main/kotlin/Server.kt → backend/src/jvmMain/kotlin/Server.kt b/backend/src/main/kotlin/Server.kt → backend/src/jvmMain/kotlin/Server.kt
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,6 +9,35 @@ plugins {
     alias(libs.plugins.shadowPlugin) apply false
 }
 
+allprojects {
+
+    repositories {
+        google()
+        mavenCentral()
+        maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
+        maven(url = "https://jitpack.io")
+        maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-coroutines/maven")
+        maven(url = "https://oss.sonatype.org/content/repositories/snapshots/")
+        maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+        maven(url = "https://androidx.dev/storage/compose-compiler/repository")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
+        maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/")
+    }
+
+//    configurations.all {
+//        resolutionStrategy.eachDependency {
+//            println(requested.module.name)
+//            if (requested.module.name.equals("kotlin-stdlib-js")) {
+//                useVersion("1.9.20-Beta")
+//            }
+//
+//            if (requested.module.name.equals("kotlin-stdlib")) {
+//                useVersion("1.9.20-dev-7405")
+//            }
+//        }
+//    }
+}
 
 /*
 buildscript {

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -10,9 +10,6 @@ plugins {
     id("io.github.luca992.multiplatform-swiftpackage") version "2.1.1"
 }
 
-// CocoaPods requires the podspec to have a version.
-version = "1.0"
-
 android {
     compileSdk = AndroidSdk.compile
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
@@ -29,6 +26,7 @@ android {
 }
 
 kotlin {
+
     listOf(
         iosX64(),
         iosArm64(),

diff --git a/compose-web-wasm/build.gradle.kts b/compose-web-wasm/build.gradle.kts
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackConfig
 plugins {
     kotlin("multiplatform")
     id("kotlinx-serialization")
-    id("org.jetbrains.compose") version "1.4.0-dev-wasm08"
+    id("org.jetbrains.compose") version "1.5.1-dev-wasm01"
 }
 
 group = "com.example"
@@ -35,16 +35,16 @@ kotlin {
         //applyBinaryen()
     }
     sourceSets {
-        val wasmMain by getting {
+        val wasmJsMain by getting {
             dependencies {
                 implementation(compose.runtime)
                 implementation(compose.foundation)
                 implementation(compose.material)
                 implementation(compose.components.resources)
 
-                implementation("io.ktor:ktor-client-core:2.3.1-wasm0")
-                implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.1-wasm0")
-                implementation("io.ktor:ktor-client-content-negotiation:2.3.1-wasm0")
+                implementation("io.ktor:ktor-client-core:2.3.3-wasm0")
+                implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.3-wasm0")
+                implementation("io.ktor:ktor-client-content-negotiation:2.3.3-wasm0")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.0-RC-wasm0")
                 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.0-RC-wasm0")
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1-wasm0")
@@ -54,6 +54,25 @@ kotlin {
     }
 }
 
+
+configurations.all {
+
+    resolutionStrategy {
+        force("org.jetbrains.kotlin:kotlin-stdlib-wasm:1.9.20-dev-7405")
+        force("org.jetbrains.kotlin:kotlin-stdlib-wasm-js:1.9.20-Beta")
+    }
+    resolutionStrategy.eachDependency {
+//        if (requested.module.name.startsWith("kotlin-stdlib-js")) {
+//            useVersion("1.9.20-Beta")
+//        }
+//
+//        if (requested.module.name.startsWith("kotlin-stdlib")) {
+//            useVersion("1.9.20-dev-7405")
+//        }
+    }
+}
+
+
 compose.experimental {
     web.application {}
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,27 +1,27 @@
 [versions]
-kotlin = "1.9.10"
-ksp = "1.9.10-1.0.13"
+kotlin = "1.9.20-Beta"
+ksp = "1.9.20-Beta-1.0.13"
 coroutines = "1.7.3"
-kotlinxSerialization = "1.5.1"
-kotlinxDateTime = "0.4.0"
+kotlinxSerialization = "1.6.0"
+kotlinxDateTime = "0.4.1"
 androidGradlePlugin = "8.1.0"
 koin = "3.4.3"
 koinCompose = "3.4.6"
 ktor = "2.3.3"
-slf4j = "2.0.7"
+slf4j = "2.0.9"
 sqlDelight = "2.0.0"
 kmpNativeCoroutines = "1.0.0-ALPHA-13"
 
 androidxActivity = "1.7.2"
-androidxComposeCompiler = "1.5.3-dev-k1.9.10-593b4c95fce"
-jbComposeCompiler = "1.5.2-beta01"
-androidxComposeBom = "2023.08.00"
-androidxNavigationCompose = "2.7.1"
-androidxLifecycle = "2.6.1"
-imageLoader = "1.6.4"
+androidxComposeCompiler = "1.5.4-dev-k1.9.20-Beta-692cbee7ddd"
+jbComposeCompiler = "1.5.2.1-Beta"
+androidxComposeBom = "2023.09.00"
+androidxNavigationCompose = "2.7.2"
+androidxLifecycle = "2.6.2"
+imageLoader = "1.6.7"
 
 composeMultiplatform = "1.5.0"
-accompanist = "0.30.1"
+accompanist = "0.32.0"
 coilCompose = "2.4.0"
 junit = "4.13.2"
 

diff --git a/graphql-server/build.gradle.kts b/graphql-server/build.gradle.kts
@@ -1,41 +1,43 @@
+
 plugins {
-  id("kotlin-platform-jvm")
+  kotlin("multiplatform")
   id("org.jetbrains.kotlin.plugin.spring") version("1.8.20")
-  id("org.jetbrains.kotlin.plugin.serialization")
+  kotlin("plugin.serialization")
   id("org.springframework.boot") version("2.7.10")
-  id("com.google.cloud.tools.appengine") version("2.4.2")
+  //id("com.google.cloud.tools.appengine") version("2.4.2")
   id("com.github.johnrengelman.shadow")
 }
 
 
-dependencies {
-  implementation("com.expediagroup:graphql-kotlin-spring-server:5.5.0")
-  implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
-  implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
-
-  testImplementation("com.squareup.okhttp3:okhttp:4.9.3")
-
-  with(Deps.Log) {
-    implementation(logback)
+kotlin {
+  jvm() {
+    withJava()
   }
 
-  implementation(project(":common"))
-}
+  sourceSets {
+    val jvmMain by getting {
+      dependencies {
+        implementation("com.expediagroup:graphql-kotlin-spring-server:5.5.0")
+        implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
+        implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0")
 
-kotlin {
-  sourceSets.all {
-    languageSettings {
-      optIn("kotlin.RequiresOptIn")
+        with(Deps.Log) {
+          implementation(logback)
+        }
+
+        implementation(project(":common"))
+      }
     }
   }
 }
 
-appengine {
-  stage {
-    setArtifact(tasks.named("bootJar").flatMap { (it as Jar).archiveFile })
-  }
-  deploy {
-    projectId = "peopleinspace-graphql"
-    version = "GCLOUD_CONFIG"
-  }
-}
+
+//appengine {
+//  stage {
+//    setArtifact(tasks.named("bootJar").flatMap { (it as Jar).archiveFile })
+//  }
+//  deploy {
+//    projectId = "peopleinspace-graphql"
+//    version = "GCLOUD_CONFIG"
+//  }
+//}
diff --git a/graphql-server/src/main/appengine/app.yaml → ...hql-server/src/jvmMain/appengine/app.yaml b/graphql-server/src/main/appengine/app.yaml → ...hql-server/src/jvmMain/appengine/app.yaml
diff --git a/...urrus/peopleinspace/DefaultApplication.kt → ...urrus/peopleinspace/DefaultApplication.kt b/...urrus/peopleinspace/DefaultApplication.kt → ...urrus/peopleinspace/DefaultApplication.kt
diff --git a/.../peopleinspace/IssPositionSubscription.kt → .../peopleinspace/IssPositionSubscription.kt b/.../peopleinspace/IssPositionSubscription.kt → .../peopleinspace/IssPositionSubscription.kt
diff --git a/.../kotlin/com/surrus/peopleinspace/graph.kt → .../kotlin/com/surrus/peopleinspace/graph.kt b/.../kotlin/com/surrus/peopleinspace/graph.kt → .../kotlin/com/surrus/peopleinspace/graph.kt
diff --git a/...n/kotlin/com/surrus/peopleinspace/main.kt → ...n/kotlin/com/surrus/peopleinspace/main.kt b/...n/kotlin/com/surrus/peopleinspace/main.kt → ...n/kotlin/com/surrus/peopleinspace/main.kt
diff --git a/...server/src/main/resources/application.yml → ...ver/src/jvmMain/resources/application.yml b/...server/src/main/resources/application.yml → ...ver/src/jvmMain/resources/application.yml
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -8,7 +8,7 @@ pluginManagement {
             maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
             maven("https://androidx.dev/storage/compose-compiler/repository")
             maven("https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
-            maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
+            maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap")
         }
     }