Dependency version bumps

buildSrc/src/main/kotlin/dependencies/Libraries.kt

@@ -10,7 +10,7 @@ object Libraries {
     val BOUNCYCASTLE = "org.bouncycastle:bcprov-jdk15on:${Versions.BOUNCYCASTLE}"
     val JUNIT_JUPITER_API = "org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT_JUPITER_API}"
     val JUNIT_JUPITER_ENGINE = "org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT_JUPITER_ENGINE}"
-    val KOTLIN_SERIALIZATION_JVM = "org.jetbrains.kotlinx:kotlinx-serialization-core:${Versions.KOTLIN_SERIALIZATION_JVM}"
+    val KOTLIN_SERIALIZATION_JSON = "org.jetbrains.kotlinx:kotlinx-serialization-json:${Versions.KOTLIN_SERIALIZATION_JSON}"
     val KOTLIN_COROUTINES_CORE = "org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.KOTLIN_COROUTINES_CORE}"
     val KTOR_SERVER_NETTY = "io.ktor:ktor-server-netty:${Versions.KTOR_SERVER_NETTY}"
     val KTOR_SERVER_SERVLET = "io.ktor:ktor-server-servlet:${Versions.KTOR_SERVER_SERVLET}"

buildSrc/src/main/kotlin/dependencies/Versions.kt

@@ -1,23 +1,23 @@
 package dependencies
 
 object Versions {
-    val JUNIT_JUPITER = "5.6.1"
+    val JUNIT_JUPITER = "5.7.0"
     val BATIK = "1.13"
-    val KOTLIN = "1.4.0"
-    val KTOR = "1.4.0"
+    val KOTLIN = "1.4.10"
+    val KTOR = "1.4.1"
     val PROGUARD = "7.0.0"
     val KOTLESS = "0.1.6"
 
     val MARKDOWNJ_CORE = "0.4"
-    val ZIP4J = "2.6.2"
-    val ITEXTPDF = "5.5.13.1"
+    val ZIP4J = "2.6.3"
+    val ITEXTPDF = "5.5.13.2"
     val BATIK_TRANSCODER = BATIK
-    val SNAKEYAML = "1.26"
+    val SNAKEYAML = "1.27"
     val SYSTEM_TRAY = "3.17"
     val BOUNCYCASTLE = "1.66"
     val JUNIT_JUPITER_API = JUNIT_JUPITER
     val JUNIT_JUPITER_ENGINE = JUNIT_JUPITER
-    val KOTLIN_SERIALIZATION_JVM = "1.0.0-RC"
+    val KOTLIN_SERIALIZATION_JSON = "1.0.0-RC2"
     val KOTLIN_COROUTINES_CORE = "1.3.9"
     val KTOR_SERVER_NETTY = KTOR
     val KTOR_SERVER_SERVLET = KTOR
@@ -28,17 +28,17 @@ object Versions {
     val KOTLIN_ARGPARSER = "2.0.7"
     val PROGUARD_GRADLE = PROGUARD
     val WCA_I18N = "0.4.3"
-    val GOOGLE_APPENGINE_GRADLE = "2.3.0"
-    val GOOGLE_CLOUD_STORAGE = "1.111.2"
+    val GOOGLE_APPENGINE_GRADLE = "2.4.1"
+    val GOOGLE_CLOUD_STORAGE = "1.113.1"
     val TNOODLE_SCRAMBLES = "0.18.0"
     val APACHE_COMMONS_LANG3 = "3.11"
     val KOTLESS_KTOR = KOTLESS
-    val TESTING_MOCKK = "1.10.0"
+    val TESTING_MOCKK = "1.10.2"
 
     object Plugins {
         val SHADOW = "6.0.0"
         val NODEJS = "2.2.4"
-        val DEPENDENCY_VERSIONS = "0.29.0"
+        val DEPENDENCY_VERSIONS = "0.33.0"
         val GIT_VERSION_TAG = "0.12.3"
 
         val KOTLIN = Versions.KOTLIN

cloudscrambles/build.gradle.kts

@@ -17,13 +17,13 @@ plugins {
     GIT_VERSION_TAG
     KOTLIN_SERIALIZATION
     GOOGLE_APPENGINE
-    KOTLESS
+    //KOTLESS
 }
 
 dependencies {
     implementation(project(":tnoodle-server"))
 
-    implementation(KOTLESS_KTOR)
+    //implementation(KOTLESS_KTOR)
     implementation(GOOGLE_CLOUD_STORAGE)
     implementation(BATIK_TRANSCODER)
 }

proguard-rules.pro

@@ -5,7 +5,7 @@
 -dontobfuscate
 -dontoptimize
 
--dontnote kotlinx.serialization.SerializationKt
+-dontnote kotlinx.serialization.AnnotationsKt
 
 # cf. https://github.com/ktorio/ktor-samples/tree/master/other/proguard
 -keep class org.worldcubeassociation.tnoodle.server.** { *; }
@@ -24,9 +24,10 @@
 -keep class dorkbox.util.jna.** { *; }
 -keep class dorkbox.systemTray.** { *; }
 
+-keep,includedescriptorclasses class kotlinx.serialization.json.**$$serializer { *; }
 -keep,includedescriptorclasses class org.worldcubeassociation.tnoodle.server.webscrambles.**$$serializer { *; }
 
--keepattributes *Annotation
+-keepattributes *Annotation*
 -keepattributes InnerClasses
 
 -keepclasseswithmembers class org.worldcubeassociation.tnoodle.server.webscrambles.** {

tnoodle-server/build.gradle.kts

@@ -8,7 +8,7 @@ import dependencies.Libraries.KTOR_SERVER_NETTY
 import dependencies.Libraries.KTOR_SERVER_HOST_COMMON
 import dependencies.Libraries.KTOR_SERVER_SERVLET
 import dependencies.Libraries.LOGBACK_CLASSIC
-import dependencies.Libraries.KOTLIN_SERIALIZATION_JVM
+import dependencies.Libraries.KOTLIN_SERIALIZATION_JSON
 import dependencies.Libraries.TNOODLE_SCRAMBLES
 
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -24,7 +24,7 @@ plugins {
 
 dependencies {
     api(KTOR_SERVER_NETTY)
-    api(KOTLIN_SERIALIZATION_JVM)
+    api(KOTLIN_SERIALIZATION_JSON)
     api(KOTLIN_COROUTINES_CORE)
     api(TNOODLE_SCRAMBLES)