Upgrade Kotlin, Spring, and KtLint versions

4 files changed, 19 insertions, 49 deletions

diff --git a/backend/build.gradle b/backend/build.gradle
index bc6913c4..a4f0dab5 100644
--- a/backend/build.gradle
+++ b/backend/build.gradle
@@ -1,52 +1,18 @@
-buildscript {
-    ext {
-        kotlinVersion = '1.2.51'
-        springBootVersion = '2.0.3.RELEASE'
-    }
-    repositories {
-        mavenCentral() // for kotlin and spring boot
-        maven {
-            url "https://plugins.gradle.org/m2/" // for ktlint
-        }
-    }
-    dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}")
-        classpath("org.jetbrains.kotlin:kotlin-allopen:${kotlinVersion}")
-        classpath "gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:4.1.0"
-    }
+plugins {
+    id 'org.jetbrains.kotlin.jvm' version '1.3.21'
+    id 'org.jetbrains.kotlin.plugin.spring' version '1.3.21'
+    id 'org.springframework.boot' version '2.1.3.RELEASE'
+    id "org.jlleitschuh.gradle.ktlint" version "7.1.0"
 }
 
-apply plugin: 'kotlin'
-apply plugin: 'kotlin-spring'
-apply plugin: 'org.springframework.boot'
 apply plugin: 'io.spring.dependency-management'
-apply plugin: "org.jlleitschuh.gradle.ktlint"
-
-group 'org.luxons'
-version '1.0-SNAPSHOT'
-
-sourceCompatibility = 1.8
-
-compileKotlin {
-    kotlinOptions {
-        freeCompilerArgs = ["-Xjsr305=strict"]
-        jvmTarget = "1.8"
-    }
-}
 
-compileTestKotlin {
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
     kotlinOptions {
-        freeCompilerArgs = ["-Xjsr305=strict"]
         jvmTarget = "1.8"
     }
 }
 
-repositories {
-    mavenCentral()
-    jcenter()
-}
-
 dependencies {
     compile project(':game-engine')
     compile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..6bef4754
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,5 @@
+subprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/frontend/build.gradle b/frontend/build.gradle
index 4051013d..46e751a6 100644
--- a/frontend/build.gradle
+++ b/frontend/build.gradle
@@ -3,7 +3,6 @@ plugins {
 }
 
 apply plugin: 'base'
-apply plugin: 'idea'
 
 buildDir = 'build'
 
diff --git a/game-engine/build.gradle b/game-engine/build.gradle
index eb706af5..b61b884e 100644
--- a/game-engine/build.gradle
+++ b/game-engine/build.gradle
@@ -1,12 +1,6 @@
 plugins {
-    id "org.jetbrains.kotlin.jvm" version "1.2.51"
-    id "org.jlleitschuh.gradle.ktlint" version "4.1.0"
-}
-
-group 'org.luxons'
-
-repositories {
-    jcenter()
+    id "org.jetbrains.kotlin.jvm" version "1.3.21"
+    id "org.jlleitschuh.gradle.ktlint" version "7.1.0"
 }
 
 dependencies {
@@ -14,3 +8,9 @@ dependencies {
     implementation 'com.github.salomonbrys.kotson:kotson:2.5.0'
     testImplementation 'junit:junit:4.12'
 }
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}