move shared build logic to buildSrc

MegavexNetwork · Mar 26, 2024 · 8408a3e · 8408a3e
1 parent c2ce803
commit 8408a3e
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 44 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -1,3 +1,4 @@
 plugins {
+  id("net.megavex.scoreboardlibrary.base-conventions")
   id("net.megavex.scoreboardlibrary.publish-conventions")
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,46 +1,5 @@
-plugins {
-  `java-library`
-}
-
 allprojects {
   version = "2.1.3"
   group = "net.megavex"
   description = "Powerful packet-level scoreboard library for Paper/Spigot servers"
-
-  repositories {
-    mavenCentral()
-    maven("https://oss.sonatype.org/content/groups/public/")
-    maven("https://repo.papermc.io/repository/maven-public/")
-  }
-}
-
-subprojects {
-  apply(plugin = "java-library")
-
-  dependencies {
-    compileOnly("org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT")
-    testImplementation("org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT")
-
-    val adventureVersion = "4.16.0"
-    compileOnly("net.kyori:adventure-api:$adventureVersion")
-    compileOnly("net.kyori:adventure-text-serializer-legacy:$adventureVersion")
-    compileOnly("net.kyori:adventure-text-serializer-gson:$adventureVersion")
-    testImplementation("net.kyori:adventure-api:$adventureVersion")
-
-    val jupiterVersion = "5.10.2"
-    testImplementation("org.junit.jupiter:junit-jupiter-api:$jupiterVersion")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion")
-  }
-
-  tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-    targetCompatibility = JavaVersion.VERSION_1_8.toString()
-    options.encoding = "UTF-8"
-    options.isIncremental = true
-    options.compilerArgs = mutableListOf("-Xlint:-deprecation,-unchecked")
-  }
-
-  tasks.test {
-    useJUnitPlatform()
-  }
 }
diff --git a/buildSrc/src/main/kotlin/net.megavex.scoreboardlibrary.base-conventions.gradle.kts b/buildSrc/src/main/kotlin/net.megavex.scoreboardlibrary.base-conventions.gradle.kts
@@ -0,0 +1,40 @@
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.withType
+
+plugins {
+  `java-library`
+}
+
+repositories {
+  mavenCentral()
+  maven("https://oss.sonatype.org/content/repositories/snapshots")
+  maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
+}
+
+dependencies {
+  compileOnly("org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT")
+  testImplementation("org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT")
+
+  val adventureVersion = "4.16.0"
+  compileOnly("net.kyori:adventure-api:$adventureVersion")
+  compileOnly("net.kyori:adventure-text-serializer-legacy:$adventureVersion")
+  compileOnly("net.kyori:adventure-text-serializer-gson:$adventureVersion")
+  testImplementation("net.kyori:adventure-api:$adventureVersion")
+
+  val jupiterVersion = "5.10.2"
+  testImplementation("org.junit.jupiter:junit-jupiter-api:$jupiterVersion")
+  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$jupiterVersion")
+}
+
+tasks.withType<JavaCompile>().configureEach {
+  sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+  targetCompatibility = JavaVersion.VERSION_1_8.toString()
+  options.encoding = "UTF-8"
+  options.isIncremental = true
+  options.compilerArgs = mutableListOf("-Xlint:-deprecation,-unchecked")
+}
+
+tasks.test {
+  useJUnitPlatform()
+}
diff --git a/commons/build.gradle.kts b/commons/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  id("net.megavex.scoreboardlibrary.base-conventions")
   id("net.megavex.scoreboardlibrary.publish-conventions")
 }
 

diff --git a/extra-kotlin/build.gradle.kts b/extra-kotlin/build.gradle.kts
@@ -1,8 +1,9 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-  kotlin("jvm") version "1.9.23"
+  id("net.megavex.scoreboardlibrary.base-conventions")
   id("net.megavex.scoreboardlibrary.publish-conventions")
+  kotlin("jvm") version "1.9.23"
 }
 
 kotlin {

diff --git a/implementation/build.gradle.kts b/implementation/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  id("net.megavex.scoreboardlibrary.base-conventions")
   id("net.megavex.scoreboardlibrary.publish-conventions")
 }
 

diff --git a/versions/modern/build.gradle.kts b/versions/modern/build.gradle.kts
@@ -1,6 +1,7 @@
 plugins {
-  id("io.papermc.paperweight.userdev") version "1.5.11"
   `maven-publish`
+  id("net.megavex.scoreboardlibrary.base-conventions")
+  id("io.papermc.paperweight.userdev") version "1.5.11"
 }
 
 dependencies {

diff --git a/versions/packet-adapter-base/build.gradle.kts b/versions/packet-adapter-base/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  id("net.megavex.scoreboardlibrary.base-conventions")
   id("net.megavex.scoreboardlibrary.publish-conventions")
 }
 

diff --git a/versions/packetevents/build.gradle.kts b/versions/packetevents/build.gradle.kts
@@ -1,9 +1,9 @@
 plugins {
+  id("net.megavex.scoreboardlibrary.base-conventions")
   id("net.megavex.scoreboardlibrary.publish-conventions")
 }
 
 repositories {
-  maven("https://repo.papermc.io/repository/maven-public/")
   maven("https://repo.codemc.io/repository/maven-releases/")
 }
 

diff --git a/versions/v1_8_R3/build.gradle.kts b/versions/v1_8_R3/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
+  id("net.megavex.scoreboardlibrary.base-conventions")
   id("net.megavex.scoreboardlibrary.publish-conventions")
 }