Update to modern java

Author: Pyrofab

build.gradle.kts

@@ -1,23 +1,41 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    java
-    kotlin("jvm") version "1.3.11"
-    id("com.github.johnrengelman.shadow") version "4.0.1"
+    application
+    kotlin("jvm") version "1.4.31"
+    id("com.github.johnrengelman.shadow") version "6.1.0"
 }
 
 group = "ladysnake"
-version = "2.0.0"
+version = "2.1.0"
+
+// https://stackoverflow.com/questions/63997525/task-run-causes-org-joor-reflectexception-java-lang-nosuchfieldexception-ja
+val currentOS = DefaultNativePlatform.getCurrentOperatingSystem()
+val platform = when {
+    currentOS.isWindows() -> "win"
+    currentOS.isLinux() -> "linux"
+    currentOS.isMacOsX() -> "mac"
+    else -> throw IllegalStateException()
+}
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
-    compile(kotlin("stdlib-jdk8"))
-    testCompile("junit", "junit", "4.12")
-    compile("no.tornado:tornadofx:1.7.16")
+    testImplementation("junit", "junit", "4.12")
+    implementation("org.openjfx:javafx-base:15.0.1:${platform}")
+    implementation("org.openjfx:javafx-controls:15.0.1:${platform}")
+    implementation("org.openjfx:javafx-graphics:15.0.1:${platform}")
+    implementation("org.openjfx:javafx-fxml:15.0.1:${platform}")
+    implementation("no.tornado:tornadofx:1.7.20")
+}
+
+application {
+    mainModule.set("ladysnake.translationhelper.app")
+    mainClass.set("ladysnake.translationhelper.TranslationHelperKt")
 }
 
 tasks.withType<ShadowJar> {
@@ -27,8 +45,13 @@ tasks.withType<ShadowJar> {
 }
 
 configure<JavaPluginConvention> {
-    sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
 }
+
 tasks.withType<KotlinCompile> {
-    kotlinOptions.jvmTarget = "1.8"
+    kotlinOptions {
+        jvmTarget = "1.8"
+        useIR = true
+    }
 }

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -15,7 +15,6 @@ class TranslationHelper: App(TranslatorView::class, AppStyle::class) {
     init {
         TranslationLoader.registerAdapter(PlainLanguageMapAdapter())
         TranslationLoader.registerAdapter(JsonLanguageMapAdapter())
-
     }
 
     override fun start(stage: Stage) {

gradlew

@@ -0,0 +1,9 @@
+module ladysnake.translationhelper.app {
+    requires javafx.base;
+    requires javafx.controls;
+    requires javafx.graphics;
+    requires kotlin.stdlib;
+    requires tornadofx;
+    requires java.prefs;
+    requires java.desktop;
+}