Update dependencies and plugins

grgit-core/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("org.ajoberstar.defaults.java-library")
-  groovy
+  id("groovy")
 }
 
 group = "org.ajoberstar.grgit"
@@ -30,7 +30,7 @@ dependencies {
 testing {
   suites {
     val test by getting(JvmTestSuite::class) {
-      useSpock("2.0-groovy-3.0")
+      useSpock("2.3-groovy-3.0")
 
       dependencies {
         implementation("org.codehaus.groovy:groovy:[3.0.9, 4.0)")

grgit-core/gradle.lockfile

@@ -1,26 +1,19 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-cglib:cglib-nodep:3.3.0=testCompileClasspath,testRuntimeClasspath
-com.googlecode.javaewah:JavaEWAH:1.1.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.10=testCompileClasspath,testRuntimeClasspath
+com.googlecode.javaewah:JavaEWAH:1.1.13=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.assertj:assertj-core:3.23.1=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:3.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.codehaus.groovy:groovy:3.0.12=testCompileClasspath,testRuntimeClasspath
+org.codehaus.groovy:groovy:3.0.17=compileClasspath,default,runtimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r=compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jetbrains:annotations:20.1.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
 org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-testkit:1.9.2=testCompileClasspath,testRuntimeClasspath
 org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.2=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm:9.1=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath
+org.slf4j:slf4j-api:1.7.30=compileClasspath,default,runtimeClasspath
 org.slf4j:slf4j-api:2.0.7=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-simple:2.0.7=testRuntimeClasspath
-org.spockframework:spock-core:2.0-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-empty=
+org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
+empty=annotationProcessor,archives,signatures,testAnnotationProcessor

grgit-gradle/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
   id("org.ajoberstar.defaults.gradle-plugin")
-  groovy
+  id("groovy")
 
   id("org.ajoberstar.stutter")
 }
@@ -27,7 +27,7 @@ dependencies {
   }
   compatTestImplementation(project(":grgit-core"))
 
-  compatTestImplementation("org.spockframework:spock-core:2.0-groovy-3.0")
+  compatTestImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
 }
 
 tasks.withType<Test>() {

grgit-gradle/gradle.lockfile

@@ -1,23 +1,15 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-cglib:cglib-nodep:3.3.0=compatTestCompileClasspath,compatTestRuntimeClasspath
-com.googlecode.javaewah:JavaEWAH:1.1.13=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.11.0=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.apiguardian:apiguardian-api:1.1.0=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.assertj:assertj-core:3.16.1=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.codehaus.groovy:groovy:3.0.17=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.googlecode.javaewah:JavaEWAH:1.1.13=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.apiguardian:apiguardian-api:1.1.2=compatTestCompileClasspath
+org.codehaus.groovy:groovy:3.0.12=compatTestCompileClasspath,compatTestRuntimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.2=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.jetbrains:annotations:20.1.0=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.7.2=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.7.2=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.7.2=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.junit.platform:junit-platform-testkit:1.7.2=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.junit:junit-bom:5.7.2=compatTestCompileClasspath,compatTestRuntimeClasspath
-org.objenesis:objenesis:3.2=compatTestCompileClasspath,compatTestRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.9.0=compatTestCompileClasspath,compatTestRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.9.0=compatTestCompileClasspath,compatTestRuntimeClasspath
+org.junit:junit-bom:5.9.0=compatTestCompileClasspath,compatTestRuntimeClasspath
 org.opentest4j:opentest4j:1.2.0=compatTestCompileClasspath,compatTestRuntimeClasspath
-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=
+org.slf4j:slf4j-api:1.7.30=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,default,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.spockframework:spock-core:2.3-groovy-3.0=compatTestCompileClasspath,compatTestRuntimeClasspath
+empty=annotationProcessor,archives,compatTestAnnotationProcessor,signatures,testAnnotationProcessor

settings.gradle.kts

@@ -1,20 +1,30 @@
 pluginManagement {
   plugins {
-    id("org.ajoberstar.defaults.java-library") version "0.17.1"
-    id("org.ajoberstar.defaults.gradle-plugin") version "0.17.1"
+    id("org.ajoberstar.defaults.java-library") version "0.17.5"
+    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()