4 files changed, 40 insertions, 13 deletions
diff --git a/buildSrc/src/main/kotlin/java-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-conventions.gradle.kts
new file mode 100644
index 00000000..d4cc667a
--- /dev/null
+++ b/buildSrc/src/main/kotlin/java-conventions.gradle.kts
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2022 AtLarge Research
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+plugins {
+    `java-library`
+}
+
+/* Project configuration */
+repositories {
+    mavenCentral()
+}
+
+java {
+    sourceCompatibility = Libs.jvmTarget
+    targetCompatibility = Libs.jvmTarget
+}
diff --git a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
index d4cc667a..6a091a37 100644
--- a/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/java-library-conventions.gradle.kts
@@ -21,15 +21,10 @@
  */
 
 plugins {
-    `java-library`
-}
-
-/* Project configuration */
-repositories {
-    mavenCentral()
+    id("java-conventions")
+    id("publishing-conventions")
 }
 
 java {
-    sourceCompatibility = Libs.jvmTarget
-    targetCompatibility = Libs.jvmTarget
+    withSourcesJar()
 }
diff --git a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
index 5d9ae56e..6b9109f7 100644
--- a/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-conventions.gradle.kts
@@ -23,7 +23,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("java-library-conventions")
+    id("java-conventions")
     kotlin("jvm")
     id("org.jlleitschuh.gradle.ktlint")
 }
diff --git a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
index 8fd45a41..86156476 100644
--- a/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/kotlin-library-conventions.gradle.kts
@@ -22,15 +22,12 @@
 
 plugins {
     id("kotlin-conventions")
+    id("java-library-conventions")
     id("publishing-conventions")
     id("dokka-conventions")
 }
 
 /* Project configuration */
-java {
-    withSourcesJar()
-}
-
 kotlin {
     explicitApi()
 }