From 4f11260fadf7f582a38a89137817e1867fe6e661 Mon Sep 17 00:00:00 2001 From: Andrew Oberstar Date: Sun, 23 Apr 2023 17:10:04 -0500 Subject: [PATCH] Update dependencies and plugins --- build.gradle.kts | 9 --------- grgit-core/build.gradle.kts | 4 ++-- grgit-core/gradle.lockfile | 21 +++++++-------------- grgit-gradle/build.gradle.kts | 4 ++-- grgit-gradle/gradle.lockfile | 28 ++++++++++------------------ settings.gradle.kts | 22 ++++++++++++++++------ 6 files changed, 37 insertions(+), 51 deletions(-) delete mode 100644 build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 33f70f20..00000000 --- a/build.gradle.kts +++ /dev/null @@ -1,9 +0,0 @@ -plugins { - id("org.ajoberstar.grgit") - id("org.ajoberstar.reckon") -} - -reckon { - scopeFromProp() - stageFromProp("beta", "rc", "final") -} diff --git a/grgit-core/build.gradle.kts b/grgit-core/build.gradle.kts index 5966f29d..ba31b989 100644 --- a/grgit-core/build.gradle.kts +++ b/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)") diff --git a/grgit-core/gradle.lockfile b/grgit-core/gradle.lockfile index 2d73ba9c..a6563203 100644 --- a/grgit-core/gradle.lockfile +++ b/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 diff --git a/grgit-gradle/build.gradle.kts b/grgit-gradle/build.gradle.kts index 7aec50f3..3594b8d8 100644 --- a/grgit-gradle/build.gradle.kts +++ b/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() { diff --git a/grgit-gradle/gradle.lockfile b/grgit-gradle/gradle.lockfile index 667fa39b..3cbb5efa 100644 --- a/grgit-gradle/gradle.lockfile +++ b/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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 46049881..a42abbc7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,13 +1,12 @@ 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 { @@ -15,6 +14,17 @@ pluginManagement { } } +plugins { + id("org.ajoberstar.reckon.settings") +} + +extensions.configure { + setDefaultInferredScope("patch") + stages("beta", "rc", "final") + setScopeCalc(calcScopeFromProp().or(calcScopeFromCommitMessages())) + setStageCalc(calcStageFromProp()) +} + dependencyResolutionManagement { repositories { mavenCentral()