Merge pull request #418 from joreilly/backend

backend updates

Author: joreilly

backend/build.gradle.kts

@@ -1,26 +1,32 @@
+@file:OptIn(ExperimentalKotlinGradlePluginApi::class)
+
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     kotlin("multiplatform")
-    application
     kotlin("plugin.serialization")
-    id("com.github.johnrengelman.shadow")
+    alias(libs.plugins.shadowPlugin)
 }
 
-
 kotlin {
     jvm() {
-        withJava()
+        binaries {
+            executable {
+                mainClass.set("ServerKt")
+            }
+        }
     }
 
     sourceSets {
         jvmMain.dependencies {
             implementation(libs.kotlinx.coroutines)
             implementation(libs.kotlinx.serialization)
 
-            implementation("io.ktor:ktor-server-core:2.3.12")
-            implementation("io.ktor:ktor-server-netty:2.3.12")
-            implementation("io.ktor:ktor-server-cors:2.3.12")
-            implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.12")
-            implementation("io.ktor:ktor-server-content-negotiation:2.3.12")
+            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("ch.qos.logback:logback-classic:1.5.8")
 
@@ -29,6 +35,9 @@ kotlin {
     }
 }
 
-application {
-    mainClass.set("ServerKt")
-}
+tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+    manifest {
+        attributes["Main-Class"] = "ServerKt"
+    }
+}
+

backend/src/jvmMain/kotlin/Server.kt

@@ -59,7 +59,7 @@ fun main() {
                     "success", 3,
                     listOf(
                         Assignment("ISS", "Chris Cassidy"),
-                        Assignment("ISS", "Anatoly Ivanishin"),
+                        Assignment("ISS", "Tracy Caldwell Dyson"),
                         Assignment("ISS", "Ivan Vagner")
                     )
                 )

gradle.properties

@@ -9,9 +9,6 @@ kotlin.code.style=official
 xcodeproj=./ios/PeopleInSpaceSwiftUI
 
 
-# https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/
-kotlin.incremental.useClasspathSnapshot=true
-
 # https://twitter.com/Sellmair/status/1543938828062392322
 import_orphan_source_sets=false
 

gradle/libs.versions.toml

@@ -6,7 +6,7 @@ compose-multiplatform = "1.8.2"
 composeUiTooling = "1.4.1"
 coroutines = "1.10.2"
 kotlinxSerialization = "1.9.0"
-androidGradlePlugin = "8.11.0"
+androidGradlePlugin = "8.11.1"
 koin = "4.1.0"
 koinCompose = "4.1.0"
 koinComposeMultiplatform = "4.1.0"
@@ -39,7 +39,7 @@ okhttp = "5.0.0"
 kermit = "2.0.6"
 
 gradleVersionsPlugin = "0.52.0"
-shadowPlugin = "8.1.1"
+shadowPlugin = "9.0.0-rc2"
 skie = "0.10.4"
 
 mcp = "0.5.0"
@@ -159,7 +159,7 @@ ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlinx-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 gradleVersionsPlugin = { id = "com.github.ben-manes.versions", version.ref  = "gradleVersionsPlugin" }
-shadowPlugin = { id = "com.github.johnrengelman.shadow", version.ref = "shadowPlugin" }
+shadowPlugin = { id = "com.gradleup.shadow", version.ref = "shadowPlugin" }
 sqlDelight = { id = "app.cash.sqldelight", version.ref = "sqlDelight" }
 jetbrainsCompose = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }