Merge 3223d16 into f775499

thewca · Feb 7, 2021 · b03c6d0 · b03c6d0
2 parents f775499 + 3223d16
commit b03c6d0
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 39 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -8,5 +8,5 @@ repositories {
 }
 
 dependencies {
-    implementation("org.bouncycastle:bcprov-jdk15on:1.66")
+    implementation("org.bouncycastle:bcprov-jdk15on:1.68")
 }
diff --git a/buildSrc/src/main/kotlin/dependencies/Versions.kt b/buildSrc/src/main/kotlin/dependencies/Versions.kt
@@ -1,25 +1,25 @@
 package dependencies
 
 object Versions {
-    val JUNIT_JUPITER = "5.7.0"
-    val BATIK = "1.13"
-    val KOTLIN = "1.4.10"
-    val KTOR = "1.4.1"
-    val PROGUARD = "7.0.0"
+    val JUNIT_JUPITER = "5.7.1"
+    val BATIK = "1.14"
+    val KOTLIN = "1.4.30"
+    val KTOR = "1.5.1"
+    val PROGUARD = "7.0.1"
     val KOTLESS = "0.1.6"
 
     val MARKDOWNJ_CORE = "0.4"
-    val ZIP4J = "2.6.3"
+    val ZIP4J = "2.6.4"
     val ITEXTPDF = "5.5.13.2"
     val BATIK_TRANSCODER = BATIK
     val BATIK_CODEC = BATIK
     val SNAKEYAML = "1.27"
     val SYSTEM_TRAY = "3.17"
-    val BOUNCYCASTLE = "1.66"
+    val BOUNCYCASTLE = "1.68"
     val JUNIT_JUPITER_API = JUNIT_JUPITER
     val JUNIT_JUPITER_ENGINE = JUNIT_JUPITER
-    val KOTLIN_SERIALIZATION_JSON = "1.0.0-RC2"
-    val KOTLIN_COROUTINES_CORE = "1.3.9"
+    val KOTLIN_SERIALIZATION_JSON = "1.0.1"
+    val KOTLIN_COROUTINES_CORE = "1.4.2"
     val KTOR_SERVER_NETTY = KTOR
     val KTOR_SERVER_SERVLET = KTOR
     val KTOR_SERIALIZATION = KTOR
@@ -30,17 +30,17 @@ object Versions {
     val PROGUARD_GRADLE = PROGUARD
     val WCA_I18N = "0.4.3"
     val GOOGLE_APPENGINE_GRADLE = "2.4.1"
-    val GOOGLE_CLOUD_STORAGE = "1.113.1"
+    val GOOGLE_CLOUD_STORAGE = "1.113.9"
     val TNOODLE_SCRAMBLES = "0.18.0"
     val APACHE_COMMONS_LANG3 = "3.11"
     val KOTLESS_KTOR = KOTLESS
-    val TESTING_MOCKK = "1.10.2"
-    val KOTLINX_ATOMICFU_GRADLE = "0.14.4"
+    val TESTING_MOCKK = "1.10.5"
+    val KOTLINX_ATOMICFU_GRADLE = "0.15.1"
 
     object Plugins {
-        val SHADOW = "6.0.0"
-        val NODEJS = "2.2.4"
-        val DEPENDENCY_VERSIONS = "0.33.0"
+        val SHADOW = "6.1.0"
+        val NODEJS = "3.0.0"
+        val DEPENDENCY_VERSIONS = "0.36.0"
         val GIT_VERSION_TAG = "0.12.3"
 
         val KOTLIN = Versions.KOTLIN

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
diff --git a/tnoodle-server/src/main/kotlin/org/worldcubeassociation/tnoodle/server/serial/JsonConfig.kt b/tnoodle-server/src/main/kotlin/org/worldcubeassociation/tnoodle/server/serial/JsonConfig.kt
@@ -1,7 +1,6 @@
 package org.worldcubeassociation.tnoodle.server.serial
 
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonConfiguration
 
 object JsonConfig {
     const val CLASS_DISCRIMINATOR = "id"

diff --git a/tnoodle-ui/build.gradle.kts b/tnoodle-ui/build.gradle.kts
@@ -1,4 +1,4 @@
-import com.moowork.gradle.node.NodeExtension
+import com.github.gradle.node.NodeExtension
 
 description = "A web ui for TNoodle that uses modern technology"
 
@@ -8,12 +8,19 @@ plugins {
 }
 
 configure<NodeExtension> {
-    download = true
-    version = "12.18.3"
+    download.set(true)
+    version.set("12.18.3")
 }
 
-tasks.getByName("yarn_build") {
-    dependsOn("yarn_install")
+val yarnInstall = tasks.named("yarn_install") {
+    inputs.file("package.json")
+    inputs.file("yarn.lock")
+
+    outputs.dir("node_modules")
+}
+
+val yarnBuild = tasks.named("yarn_build") {
+    dependsOn(yarnInstall)
 
     inputs.files(fileTree("src").exclude("*.css"))
     inputs.dir("public")
@@ -23,32 +30,25 @@ tasks.getByName("yarn_build") {
     outputs.file("${project.buildDir}/index.html")
 }
 
-tasks.getByName("yarn_install") {
-    inputs.file("package.json")
-    inputs.file("yarn.lock")
-
-    outputs.dir("node_modules")
+val yarnTest = tasks.named("yarn_test") {
+    dependsOn(yarnBuild)
 }
 
-tasks.getByName("assemble") {
-    dependsOn("packageReactFrontend")
+val yarnPrettier = tasks.named("yarn_prettier") {
+    dependsOn(yarnInstall)
 }
 
 tasks.getByName("check") {
-    dependsOn("yarn_test")
-    dependsOn("yarn_prettier")
+    dependsOn(yarnTest)
+    dependsOn(yarnPrettier)
 }
 
-tasks.getByName("yarn_test") {
-    dependsOn("yarn_install")
-}
-
-tasks.getByName("yarn_prettier") {
-    dependsOn("yarn_install")
+tasks.getByName("assemble") {
+    dependsOn("packageReactFrontend")
 }
 
 tasks.create<Zip>("packageReactFrontend") {
-    dependsOn("yarn_build")
+    dependsOn(yarnBuild)
 
     archiveBaseName.set("react-new-frontend")
     archiveExtension.set("jar")