feat: add isJitpackEnv util; fix build?

* rollback publish-conventions change in 201c6a7 * i think jitpack wants the jar task outputs, so i'll un-disable them
the-h-team · Dec 1, 2023 · 1ffd099 · 1ffd099
1 parent 201c6a7
commit 1ffd099
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -10,10 +10,6 @@ plugins {
     id("com.github.johnrengelman.shadow")
 }
 
-tasks.jar {
-    enabled = false
-}
-
 dependencies {
     implementation(project(getSubproject("api")))
 //    implementation(project(getSubproject("cli")))

diff --git a/buildSrc/src/main/kotlin/Extensions.kt b/buildSrc/src/main/kotlin/Extensions.kt
@@ -29,4 +29,12 @@ fun Project.setMavenName(name: String) {
             }
         }
     }
-}
+}
+
+/**
+ * Detects whether we are building on Jitpack.
+ *
+ * @return true if we are building on Jitpack
+ */
+val isJitpackEnv: Boolean
+    get() = System.getenv("JITPACK") == "true"
diff --git a/buildSrc/src/main/kotlin/clans.publish-conventions.gradle.kts b/buildSrc/src/main/kotlin/clans.publish-conventions.gradle.kts
@@ -18,7 +18,7 @@ tasks.withType<Javadoc> {
 
 afterEvaluate {
     publishing {
-        val publicationName = if (System.getenv("JITPACK") != "true") name else "mavenJava"
+        val publicationName = name
         publications.create<MavenPublication>(publicationName) {
             pom {
                 name.set("Clans")

diff --git a/cli/build.gradle.kts b/cli/build.gradle.kts
@@ -19,10 +19,6 @@ dependencies {
     implementation("com.github.Revxrsal.Lamp:bukkit:$lampVersion")
 }
 
-tasks.jar {
-    enabled = false
-}
-
 tasks.withType<JavaCompile> { // Preserve parameter names in the bytecode
     options.compilerArgs.add("-parameters")
 }