From a82dba0c3cb29437bd0362fe0b7708c791e9ac7a Mon Sep 17 00:00:00 2001
From: Obique <obique.pswg@gmail.com>
Date: Sat, 21 Mar 2020 13:35:30 -0400
Subject: [PATCH] Updated Java version to 13

---
 .github/workflows/deploy.yml | 4 ++--
 .github/workflows/verify.yml | 4 ++--
 build.gradle.kts             | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 771f724ee..345e53bfd 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -13,10 +13,10 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: true
-    - name: Set up JDK 12
+    - name: Set up JDK 13
       uses: actions/setup-java@v1
       with:
-        java-version: 12
+        java-version: 13
     - name: Build
       run: ./gradlew --no-daemon clean test jlink
     - name: Docker Login
diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
index ad517d046..30bfca1a4 100644
--- a/.github/workflows/verify.yml
+++ b/.github/workflows/verify.yml
@@ -16,9 +16,9 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: true
-    - name: Set up JDK 12
+    - name: Set up JDK 13
       uses: actions/setup-java@v1
       with:
-        java-version: 12
+        java-version: 13
     - name: Test with Gradle
       run: ./gradlew --no-daemon test
diff --git a/build.gradle.kts b/build.gradle.kts
index c4bd0075c..70e94a944 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,8 @@ plugins {
 	id("org.beryx.jlink") version "2.17.2"
 }
 
-val javaMajorVersion = "12"
+val javaMajorVersion = "13"
+val kotlinTargetVersion = "12"
 
 application {
 	mainClassName = "holocore/com.projectswg.holocore.ProjectSWG"
@@ -91,7 +92,7 @@ tasks.named<ShadowJar>("shadowJar") {
 
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class).configureEach {
 	kotlinOptions {
-		jvmTarget = javaMajorVersion
+		jvmTarget = kotlinTargetVersion
 	}
 }