Move versions around.

cs125-illinois · Dec 16, 2019 · 4ad2a95 · 4ad2a95
1 parent 414b705
commit 4ad2a95
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -9,15 +9,15 @@ plugins {
 }
 
 group = "com.github.cs125-illinois"
-version = "2019.12.2"
+version = "2019.12.3"
 
 dependencies {
     antlr("org.antlr:antlr4:4.7.2")
 
     implementation(kotlin("stdlib"))
     implementation(kotlin("compiler-embeddable"))
 
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2-1.3.60")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
     implementation("com.puppycrawl.tools:checkstyle:8.27")
     implementation("org.jetbrains.kotlin:kotlin-reflect:1.3.61")
     implementation("com.github.jknack:handlebars:4.1.2")
@@ -54,6 +54,6 @@ task("createProperties") {
         val properties = Properties().also {
             it["version"] = project.version.toString()
         }
-        File(projectDir, "src/main/resources/core_version.properties").printWriter().use { properties.store(it, null) }
+        File(projectDir, "src/main/resources/edu.illinois.cs.cs125.jeed.core.version").printWriter().use { properties.store(it, null) }
     }
 }
diff --git a/core/src/main/kotlin/Version.kt b/core/src/main/kotlin/Version.kt
@@ -4,7 +4,7 @@ import java.util.*
 
 val version = run {
     try {
-        val versionFile = object : Any() {}::class.java.getResource("/core_version.properties")
+        val versionFile = object : Any() {}::class.java.getResource("/edu.illinois.cs.cs125.jeed.core.version")
         Properties().also { it.load(versionFile.openStream()) }["version"] as String
     } catch (e: Exception) {
         println(e)

diff --git a/core/src/main/resources/core_version.properties b/core/src/main/resources/core_version.properties
diff --git a/core/src/main/resources/edu.illinois.cs.cs125.jeed.core.version b/core/src/main/resources/edu.illinois.cs.cs125.jeed.core.version
@@ -0,0 +1,2 @@
+#Mon Dec 16 14:58:25 CST 2019
+version=2019.12.3
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -18,8 +18,8 @@ dependencies {
     implementation(project(":core"))
     implementation(kotlin("stdlib"))
     implementation("io.ktor:ktor-server-netty:$ktorVersion")
-    implementation("org.mongodb:mongodb-driver:3.11.2")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2-1.3.60")
+    implementation("org.mongodb:mongodb-driver:3.12.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3")
     implementation("com.squareup.moshi:moshi-kotlin:1.9.2")
     implementation("com.ryanharter.ktor:ktor-moshi:1.0.1")
     implementation("ch.qos.logback:logback-classic:1.2.3")
@@ -63,7 +63,7 @@ task("createProperties") {
         val properties = Properties().also {
             it["version"] = project.version.toString()
         }
-        File(projectDir, "src/main/resources/version.properties").printWriter().use { properties.store(it, null) }
+        File(projectDir, "src/main/resources/edu.illinois.cs.cs125.jeed.server.version").printWriter().use { properties.store(it, null) }
     }
 }
 tasks.processResources {

diff --git a/server/src/main/kotlin/Main.kt b/server/src/main/kotlin/Main.kt
@@ -18,7 +18,7 @@ import java.util.*
 val logger = KotlinLogging.logger {}
 
 val VERSION: String = Properties().also {
-    it.load((object : Any() {}).javaClass.getResourceAsStream("/version.properties"))
+    it.load((object : Any() {}).javaClass.getResourceAsStream("/edu.illinois.cs.cs125.jeed.server.version"))
 }.getProperty("version")
 
 fun main() {

diff --git a/server/src/main/resources/edu.illinois.cs.cs125.jeed.server.version b/server/src/main/resources/edu.illinois.cs.cs125.jeed.server.version
@@ -0,0 +1,2 @@
+#Mon Dec 16 15:00:03 CST 2019
+version=2019.12.3
diff --git a/server/src/main/resources/version.properties b/server/src/main/resources/version.properties
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Mon Dec 16 14:58:25 CST 2019
		version=2019.12.3
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Mon Dec 16 15:00:03 CST 2019
		version=2019.12.3