From 242066cbb54beffebd84262d407e99c21c6aa413 Mon Sep 17 00:00:00 2001
From: Obique PSWG <obique.pswg@gmail.com>
Date: Mon, 12 Apr 2021 11:53:12 -0500
Subject: [PATCH] Removed modularization dependency and increased JDK
 compatibility

---
 build.gradle.kts                                | 17 +++++++++++++----
 settings.gradle                                 |  1 -
 settings.gradle.kts                             |  1 +
 .../holocore/client/HolocoreInputStream.kt      |  2 +-
 .../holocore/client/ServerConnectionStatus.java |  8 ++++++++
 .../holocore/client/ServerConnectionStatus.kt   |  8 --------
 6 files changed, 23 insertions(+), 14 deletions(-)
 delete mode 100644 settings.gradle
 create mode 100644 settings.gradle.kts
 create mode 100644 src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.java
 delete mode 100644 src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 405902a..4b022ed 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,12 +1,19 @@
 plugins {
 	idea
 	java
-	id("org.javamodularity.moduleplugin")
 	kotlin("jvm")
 }
 
+val javaVersion: String by ext
+val javaMajorVersion: String by ext
+val kotlinTargetJdk: String by ext
+
+java {
+	modularity.inferModulePath.set(true)
+}
+
 idea {
-	targetVersion = "12.0.1"
+	targetVersion = javaVersion
     module {
         inheritOutputDirs = true
     }
@@ -19,9 +26,11 @@ repositories {
 
 sourceSets {
 	main {
+        java.outputDir = File(java.outputDir.toString().replace("\\${File.separatorChar}java", ""))
+		
 		dependencies {
-			implementation(project(":pswgcommon"))
 			implementation(kotlin("stdlib"))
+			implementation(project(":pswgcommon"))
 			api(group="me.joshlarson", name="jlcommon-network", version="1.0.0")
 		}
 	}
@@ -34,6 +43,6 @@ sourceSets {
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
 	kotlinOptions {
-		jvmTarget = "12"
+		jvmTarget = kotlinTargetJdk
 	}
 }
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 2e860fa..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':pswgcommon'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..ce0d209
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1 @@
+include(":pswgcommon")
diff --git a/src/main/java/com/projectswg/holocore/client/HolocoreInputStream.kt b/src/main/java/com/projectswg/holocore/client/HolocoreInputStream.kt
index 097ee2d..49e42e9 100644
--- a/src/main/java/com/projectswg/holocore/client/HolocoreInputStream.kt
+++ b/src/main/java/com/projectswg/holocore/client/HolocoreInputStream.kt
@@ -27,7 +27,7 @@ class HolocoreInputStream(private val stream: InputStream): Closeable {
 					return protocol.disassemble() ?: continue
 			} while (true)
 		}
-		throw AssertionError("unreachable code")
+		throw AssertionError("unreachable")
 	}
 	
 	override fun close() {
diff --git a/src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.java b/src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.java
new file mode 100644
index 0000000..72ac13c
--- /dev/null
+++ b/src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.java
@@ -0,0 +1,8 @@
+package com.projectswg.holocore.client;
+
+public enum ServerConnectionStatus {
+	CONNECTING,
+	CONNECTED,
+	DISCONNECTING,
+	DISCONNECTED
+}
diff --git a/src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.kt b/src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.kt
deleted file mode 100644
index f18c405..0000000
--- a/src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.projectswg.holocore.client
-
-enum class ServerConnectionStatus {
-	CONNECTING,
-	CONNECTED,
-	DISCONNECTING,
-	DISCONNECTED
-}