diff --git a/CommonCore/SQL/build.gradle.kts b/CommonCore/SQL/build.gradle.kts
index 2e384e19..b6d0195d 100644
--- a/CommonCore/SQL/build.gradle.kts
+++ b/CommonCore/SQL/build.gradle.kts
@@ -18,7 +18,6 @@
  */
 
 plugins {
-    steamwar.java
     steamwar.kotlin
 }
 
@@ -31,37 +30,6 @@ java {
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-sourceSets {
-    main {
-        java {
-            srcDirs("src/")
-            exclude("**/*.kt")
-        }
-        kotlin {
-            srcDirs("src/")
-            exclude("**/*.java")
-        }
-        resources {
-            srcDirs("src/")
-            exclude("**/*.java", "**/*.kt")
-        }
-    }
-    test {
-        java {
-            srcDirs("testsrc/")
-            exclude("**/*.kt")
-        }
-        kotlin {
-            srcDirs("testsrc/")
-            exclude("**/*.java")
-        }
-        resources {
-            srcDirs("testsrc/")
-            exclude("**/*.java", "**/*.kt")
-        }
-    }
-}
-
 dependencies {
     compileOnly(libs.sqlite)
 
diff --git a/buildSrc/src/steamwar.java.gradle b/buildSrc/src/steamwar.java.gradle
index a0da4a5f..338a496c 100644
--- a/buildSrc/src/steamwar.java.gradle
+++ b/buildSrc/src/steamwar.java.gradle
@@ -34,6 +34,7 @@ sourceSets {
     main {
         java {
             srcDirs("src/")
+            exclude("**/*.kt")
         }
         resources {
             srcDirs("src/")
@@ -43,6 +44,7 @@ sourceSets {
     test {
         java {
             srcDirs("testsrc/")
+            exclude("**/*.kt")
         }
         resources {
             srcDirs("testsrc/")
diff --git a/buildSrc/src/steamwar.kotlin.gradle b/buildSrc/src/steamwar.kotlin.gradle
index 72e6d640..e1a633c5 100644
--- a/buildSrc/src/steamwar.kotlin.gradle
+++ b/buildSrc/src/steamwar.kotlin.gradle
@@ -18,6 +18,7 @@
  */
 
 plugins {
+    id 'java-library'
     id "org.jetbrains.kotlin.jvm"
 }
 
@@ -38,6 +39,11 @@ sourceSets {
     main {
         java {
             srcDirs("src/")
+            exclude("**/*.kt")
+        }
+        kotlin {
+            srcDirs("src/")
+            exclude("**/*.java")
         }
         resources {
             srcDirs("src/")
@@ -47,10 +53,15 @@ sourceSets {
     test {
         java {
             srcDirs("testsrc/")
+            exclude("**/*.kt")
+        }
+        kotlin {
+            srcDirs("testsrc/")
+            exclude("**/*.java")
         }
         resources {
             srcDirs("testsrc/")
             exclude("**/*.java", "**/*.kt")
         }
     }
-}
+}
\ No newline at end of file