Restructure convention plugins

Fixes a bug where all templates where being published under the wrong group
bluesun · Jan 9, 2021 · 2239f51 · 2239f51
1 parent cfa61e7
commit 2239f51
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 107 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,8 @@
 plugins {
+  id("convention.lint")
+
   id("org.ajoberstar.grgit")
   id("org.ajoberstar.reckon")
-  id("com.diffplug.spotless")
 }
 
 reckon {

diff --git a/buildSrc/src/main/kotlin/convention.clojars-publish.gradle.kts b/buildSrc/src/main/kotlin/convention.clojars-publish.gradle.kts
@@ -0,0 +1,50 @@
+plugins {
+  java
+  `maven-publish`
+}
+
+java {
+  withSourcesJar()
+}
+
+publishing {
+  repositories {
+    maven {
+      name = "clojars"
+      url = uri("https://repo.clojars.org")
+      credentials {
+        username = System.getenv("CLOJARS_USER")
+        password = System.getenv("CLOJARS_TOKEN")
+      }
+    }
+  }
+
+  publications.withType<MavenPublication>() {
+    // use static versions in poms
+    versionMapping {
+      usage("java-api") {
+        fromResolutionOf("runtimeClasspath")
+      }
+      usage("java-runtime") {
+        fromResolutionResult()
+      }
+    }
+
+    pom {
+      // include repository info in POM (needed for cljdoc)
+      scm {
+        connection.set("https://github.com/clojurephant/clojurephant.git")
+        developerConnection.set("git@github.com:clojurephant/clojurephant.git")
+        url.set("https://github.com/clojurephant/clojurephant")
+        if (!version.toString().contains("+")) {
+          tag.set(version.toString())
+        }
+      }
+    }
+  }
+}
+
+// Clojars doesn"t support module metadata
+tasks.withType<GenerateModuleMetadata>() {
+    enabled = false
+}
diff --git a/buildSrc/src/main/kotlin/convention.lint.gradle.kts b/buildSrc/src/main/kotlin/convention.lint.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+  id("com.diffplug.spotless")
+}
+
+spotless {
+  java {
+    importOrder("java", "javax", "")
+    removeUnusedImports()
+    eclipse().configFile(rootProject.file("gradle/eclipse-java-formatter.xml"))
+  }
+}
diff --git a/...c/main/kotlin/clj-new-template.gradle.kts → ...ain/kotlin/convention.template.gradle.kts b/...c/main/kotlin/clj-new-template.gradle.kts → ...ain/kotlin/convention.template.gradle.kts
diff --git a/buildSrc/src/main/kotlin/library-convention.gradle.kts b/buildSrc/src/main/kotlin/library-convention.gradle.kts
diff --git a/clojurephant-plugin/build.gradle.kts b/clojurephant-plugin/build.gradle.kts
@@ -2,11 +2,20 @@ import dev.clojurephant.plugin.clojure.tasks.ClojureCompile
 import org.gradle.plugins.ide.eclipse.model.EclipseModel
 
 plugins {
-  `library-convention`
-  `java-gradle-plugin`
+  id("convention.clojars-publish")
+  id("convention.lint")
 
-  id("org.ajoberstar.stutter")
+  id("dev.clojurephant.clojure")
+
+  `java-gradle-plugin`
   id("com.gradle.plugin-publish")
+  id("org.ajoberstar.stutter")
+}
+
+group = "dev.clojurephant"
+
+configure<JavaPluginConvention> {
+  sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {
@@ -67,14 +76,6 @@ tasks.withType<Test>().matching { t -> t.name.startsWith("compatTest") }.all {
   systemProperty("org.gradle.testkit.dir", file("build/stutter-test-kit").absolutePath)
 }
 
-publishing {
-  publications {
-    create<MavenPublication>("pluginMaven") {
-      artifact(tasks.sourcesJar)
-    }
-  }
-}
-
 gradlePlugin {
   plugins {
     create("clojureBase") {

diff --git a/clojurephant-tools/build.gradle.kts b/clojurephant-tools/build.gradle.kts
@@ -2,7 +2,16 @@ import dev.clojurephant.plugin.clojure.tasks.ClojureCheck
 import dev.clojurephant.plugin.clojure.tasks.ClojureCompile
 
 plugins {
-  `library-convention`
+  id("convention.clojars-publish")
+  id("convention.lint")
+
+  id("dev.clojurephant.clojure")
+}
+
+group = "dev.clojurephant"
+
+configure<JavaPluginConvention> {
+  sourceCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {
@@ -18,7 +27,6 @@ publishing {
   publications {
     create<MavenPublication>("main") {
       from(components["java"])
-      artifact(tasks.sourcesJar)
     }
   }
 }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -10,6 +10,17 @@ pluginManagement {
   }
 }
 
+dependencyResolutionManagement {
+  repositories {
+    mavenCentral()
+    maven {
+      name = "Clojars"
+      url = uri("https://repo.clojars.org/")
+    }
+  }
+  repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+}
+
 rootProject.name = "clojurephant"
 include("clojurephant-plugin")
 include("clojurephant-tools")

diff --git a/templates/clojurephant-clj-app/build.gradle.kts b/templates/clojurephant-clj-app/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
-  `clj-new-template`
-  `library-convention`
+  id("convention.clojars-publish")
+  id("convention.lint")
+  id("convention.template")
 }
diff --git a/templates/clojurephant-clj-lib/build.gradle.kts b/templates/clojurephant-clj-lib/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
-  `clj-new-template`
-  `library-convention`
+  id("convention.clojars-publish")
+  id("convention.lint")
+  id("convention.template")
 }
diff --git a/templates/clojurephant-cljs-app/build.gradle.kts b/templates/clojurephant-cljs-app/build.gradle.kts
@@ -1,4 +1,5 @@
 plugins {
-  `clj-new-template`
-  `library-convention`
+  id("convention.clojars-publish")
+  id("convention.lint")
+  id("convention.template")
 }