Removed modularization dependency and increased JDK compatibility

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
 	}
 }

settings.gradle

@@ -1 +0,0 @@
-include ':pswgcommon'

settings.gradle.kts

@@ -0,0 +1 @@
+include(":pswgcommon")

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() {

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
+}

src/main/java/com/projectswg/holocore/client/ServerConnectionStatus.kt

@@ -1,8 +0,0 @@
-package com.projectswg.holocore.client
-
-enum class ServerConnectionStatus {
-	CONNECTING,
-	CONNECTED,
-	DISCONNECTING,
-	DISCONNECTED
-}