From: TheSaminator <TheSaminator@users.noreply.github.com>
Date: Mon, 7 Feb 2022 12:51:41 +0000 (-0500)
Subject: Will this work?!
X-Git-Url: https://gitweb.starshipfights.net/?a=commitdiff_plain;h=fccdfa218fb71830208d8ea0f2185b7491dbf0d9;p=starship-fights

Will this work?!
---

diff --git a/build.gradle.kts b/build.gradle.kts
index 4d35da6..dd4d7b4 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -37,6 +37,7 @@ kotlin {
 		val commonMain by getting {
 			dependencies {
 				implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
+				implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.3.2")
 				implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
 				
 				implementation("org.jetbrains.kotlinx:kotlinx-html:0.7.3")
@@ -45,6 +46,9 @@ kotlin {
 		
 		val jvmMain by getting {
 			dependencies {
+				implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0")
+				implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.0")
+				
 				implementation("io.ktor:ktor-server-netty:1.6.7")
 				implementation("io.ktor:ktor-html-builder:1.6.7")
 				implementation("io.ktor:ktor-auth:1.6.7")
@@ -57,6 +61,10 @@ kotlin {
 				
 				implementation("org.litote.kmongo:kmongo-coroutine-serialization:4.4.0") {
 					exclude("org.jetbrains.kotlin", "kotlin-reflect")
+					
+					exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-jdk8")
+					exclude("org.jetbrains.kotlinx", "kotlinx-coroutines-reactive")
+					exclude("org.jetbrains.kotlinx", "kotlinx-serialization-core-jvm")
 				}
 				
 				implementation("de.flapdoodle.embed:de.flapdoodle.embed.mongo:3.0.0")
diff --git a/src/jvmMain/kotlin/starshipfights/data/data_connection.kt b/src/jvmMain/kotlin/starshipfights/data/data_connection.kt
index b6cf384..8002e58 100644
--- a/src/jvmMain/kotlin/starshipfights/data/data_connection.kt
+++ b/src/jvmMain/kotlin/starshipfights/data/data_connection.kt
@@ -19,7 +19,6 @@ import org.litote.kmongo.serialization.changeIdController
 import org.litote.kmongo.serialization.registerSerializer
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
-import starshipfights.game.MomentSerializer
 import java.io.File
 import java.net.ServerSocket
 import kotlin.system.exitProcess
@@ -91,7 +90,6 @@ object ConnectionHolder {
 		
 		changeIdController(DocumentIdController)
 		registerSerializer(IdSerializer)
-		registerSerializer(MomentSerializer)
 		
 		databaseName = db
 		clientDeferred.complete(KMongo.createClient(conn.createUrl()).coroutine)