Switch to gradle-defaults

ajoberstar · Feb 10, 2022 · 996cb6b · 996cb6b
1 parent c0450b1
commit 996cb6b
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 197 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 reckon {
   scopeFromProp()
-  stageFromProp("alpha", "beta", "rc", "final")
+  stageFromProp("beta", "rc", "final")
 }
 
 jbake {

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
diff --git a/buildSrc/src/main/kotlin/java-library-convention.gradle.kts b/buildSrc/src/main/kotlin/java-library-convention.gradle.kts
diff --git a/buildSrc/src/main/kotlin/locking-convention.gradle.kts b/buildSrc/src/main/kotlin/locking-convention.gradle.kts
diff --git a/buildSrc/src/main/kotlin/spotless-convention.gradle.kts b/buildSrc/src/main/kotlin/spotless-convention.gradle.kts
diff --git a/grgit-core/build.gradle.kts b/grgit-core/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("java-library-convention")
+  id("org.ajoberstar.defaults.java-library")
   groovy
   id("org.gradle.test-retry")
 }

diff --git a/grgit-gradle/build.gradle.kts b/grgit-gradle/build.gradle.kts
@@ -1,9 +1,7 @@
 plugins {
-  id("java-library-convention")
-  id("java-gradle-plugin")
+  id("org.ajoberstar.defaults.gradle-plugin")
   groovy
 
-  id("com.gradle.plugin-publish")
   id("org.ajoberstar.stutter")
 }
 
@@ -62,30 +60,19 @@ tasks.named("check") {
   dependsOn(tasks.named("compatTest"))
 }
 
-pluginBundle {
-  website = "https://github.com/ajoberstar/grgit"
-  vcsUrl = "https://github.com/ajoberstar/grgit.git"
-  description = "The Groovy way to use Git"
+gradlePlugin {
   plugins {
     create("grgitPlugin") {
       id = "org.ajoberstar.grgit"
       displayName = "The Groovy way to use Git"
-      tags = listOf("git", "groovy")
+      description = "The Groovy way to use Git"
+      implementationClass = "org.ajoberstar.grgit.gradle.GrgitPlugin"
     }
     create("grgitServicePlugin") {
       id = "org.ajoberstar.grgit-service"
       displayName = "The Groovy way to use Git (BuildService edition)"
-      tags = listOf("git", "groovy")
+      description = "The Groovy way to use Git (BuildService edition)"
+      implementationClass = "org.ajoberstar.grgit.gradle.GrgitServicePlugin"
     }
   }
-  mavenCoordinates {
-    groupId = project.group as String
-    artifactId = project.name as String
-    version = project.version.toString()
-  }
-}
-
-// remove duplicate publication
-gradlePlugin {
-  setAutomatedPublishing(false)
 }
diff --git a/...gradle/src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit-service.properties b/...gradle/src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit-service.properties
diff --git a/grgit-gradle/src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit.properties b/grgit-gradle/src/main/resources/META-INF/gradle-plugins/org.ajoberstar.grgit.properties
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,13 +1,14 @@
 pluginManagement {
   plugins {
-    id("org.gradle.test-retry") version "1.3.1"
-    id("com.gradle.plugin-publish") version "0.20.0"
+    id("org.ajoberstar.defaults.java-library") version "0.17.1"
+    id("org.ajoberstar.defaults.gradle-plugin") version "0.17.1"
 
     id("org.ajoberstar.grgit") version "4.1.1"
-    id("org.ajoberstar.reckon") version "0.13.1"
-    id("org.ajoberstar.git-publish") version "3.0.0"
+    id("org.ajoberstar.reckon") version "0.13.2"
+    id("org.ajoberstar.git-publish") version "3.0.1"
     id("org.ajoberstar.stutter") version "0.7.0"
 
+    id("org.gradle.test-retry") version "1.3.1"
     id("com.diffplug.spotless") version "6.2.1"
     id("org.jbake.site") version "5.5.0"
   }