build: use kotlin dsl extensions

ScreamingSandals · Dec 22, 2024 · 4dac7f0 · 4dac7f0
1 parent 496aafe
commit 4dac7f0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew clean checkLicenses build shadowJar publish --stacktrace --warning-mode all
+        run: ./gradlew clean checkLicenses build publish --stacktrace --warning-mode all
         env:
           NEXUS_URL_RELEASE: ${{ secrets.NEXUS_URL_RELEASE }}
           NEXUS_URL_SNAPSHOT: ${{ secrets.NEXUS_URL_SNAPSHOT }}

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -25,4 +25,4 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew clean checkLicenses build shadowJar --stacktrace --warning-mode all
+        run: ./gradlew clean checkLicenses build --stacktrace --warning-mode all
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,9 +1,6 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import io.freefair.gradle.plugins.lombok.LombokPlugin
-import org.screamingsandals.gradle.builder.BuilderPlugin
-import org.screamingsandals.gradle.builder.MavenUtilities
-import org.screamingsandals.gradle.builder.Utilities
-import org.screamingsandals.gradle.builder.JavadocUtilities
+import org.screamingsandals.gradle.builder.*
 import org.screamingsandals.gradle.slib.SLibPlugin
 import org.screamingsandals.gradle.slib.SLibExtension
 
@@ -13,22 +10,26 @@ plugins {
     alias(libs.plugins.lombok) apply false
 }
 
-defaultTasks("clean", "build", "shadowJar")
+defaultTasks("clean", "build")
 
 subprojects {
     apply<JavaPlugin>()
     apply<BuilderPlugin>()
     apply<LombokPlugin>()
 
-    var mavenPublication: MavenPublication? = null
-    Utilities.configureLicenser(project)
+    if (project.name != "BedWars-protocol") {
+        configureShadowPlugin()
+    }
+
+    configureLicenser()
     if (project.name != "BedWars-common") {
-        Utilities.configureSourceJarTasks(project)
-        mavenPublication = MavenUtilities.setupPublishing(project).publication
-        if (!version.toString().endsWith("-SNAPSHOT") && project.name == "BedWars-API") {
-            JavadocUtilities.configureJavadocTasks(project)
+        configureSourceJarTasks()
+        val buildJavadoc = !version.toString().endsWith("-SNAPSHOT") && project.name == "BedWars-API"
+        setupMavenPublishing(addSourceJar=true, addJavadocJar=buildJavadoc)
+        if (buildJavadoc) {
+            configureJavadocTasks()
         }
-        MavenUtilities.setupMavenRepositoriesFromProperties(project)
+        setupMavenRepositoriesFromProperties()
     }
 
     repositories {
@@ -88,8 +89,6 @@ subprojects {
         }
     }
 
-    Utilities.configureShadowPlugin(project, mavenPublication)
-
     configurations.all {
         // Check for updates every build
         resolutionStrategy.cacheChangingModulesFor(0, "seconds")