Update plugins and build config

ajoberstar · Apr 23, 2023 · 65ac544 · 65ac544
1 parent 3e29a1b
commit 65ac544
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,19 +3,11 @@ plugins {
   id("groovy")
 
   id("org.ajoberstar.stutter")
-  id("org.ajoberstar.grgit")
-  id("org.ajoberstar.reckon")
 }
 
 group = "org.ajoberstar.git-publish"
 description = "Gradle plugin for publishing to Git repositories"
 
-reckon {
-  stages("beta", "rc", "final")
-  setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages()))
-  setStageCalc(calcStageFromProp())
-}
-
 mavenCentral {
   developerName.set("Andrew Oberstar")
   developerEmail.set("ajoberstar@gmail.com")

diff --git a/gradle.lockfile b/gradle.lockfile
@@ -22,4 +22,4 @@ org.opentest4j:opentest4j:1.2.0=compatTestCompileClasspath,compatTestRuntimeClas
 org.ow2.asm:asm:9.1=compatTestCompileClasspath,compatTestRuntimeClasspath
 org.slf4j:slf4j-api:1.7.30=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.0-groovy-3.0=compatTestCompileClasspath,compatTestRuntimeClasspath
-empty=
+empty=annotationProcessor,compatTestAnnotationProcessor,signatures,testAnnotationProcessor
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,19 +1,29 @@
 pluginManagement {
   plugins {
-    id("org.ajoberstar.defaults.gradle-plugin") version "0.17.1"
+    id("org.ajoberstar.defaults.gradle-plugin") version "0.17.5"
 
-    id("org.ajoberstar.grgit") version "5.0.0"
-    id("org.ajoberstar.reckon") version "0.16.1"
-    id("org.ajoberstar.stutter") version "0.7.1"
+    id("org.ajoberstar.reckon.settings") version "0.18.0"
+    id("org.ajoberstar.stutter") version "0.7.2"
 
-    id("com.diffplug.spotless") version "6.9.1"
+    id("com.diffplug.spotless") version "6.18.0"
   }
 
   repositories {
     mavenCentral()
   }
 }
 
+plugins {
+  id("org.ajoberstar.reckon.settings")
+}
+
+extensions.configure<org.ajoberstar.reckon.gradle.ReckonExtension> {
+  setDefaultInferredScope("patch")
+  stages("beta", "rc", "final")
+  setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages()))
+  setStageCalc(calcStageFromProp())
+}
+
 dependencyResolutionManagement {
   repositories {
     mavenCentral()