major: Remove default setting for defaultInferredScope

Fixes #195

README.md

@@ -141,10 +141,10 @@ reckon {
   // snapshotFromProp()
   // END LEGACY
   
-  // omit this to use the default of 'minor'
+  // required as of 0.18.0 (previously defaulted to 'minor')
   defaultInferredScope = 'patch'
   
-  // omit this to use the deafult of 'patch'
+  // omit this to use the default of 'patch'
   // if you use branches like maintenance/1.2.x, set this to 'minor'
   // if you use branches like maintenance/2.x, set this to 'major'
   parallelBranchScope = 'minor'

reckon-core/src/main/java/org/ajoberstar/reckon/core/Reckoner.java

@@ -157,7 +157,7 @@ public static final class Builder {
     private VcsInventorySupplier inventorySupplier;
     private ScopeCalculator scopeCalc;
     private StageCalculator stageCalc;
-    private Scope defaultInferredScope = Scope.MINOR;
+    private Scope defaultInferredScope;
     private Scope parallelBranchScope = Scope.PATCH;
     private Set<String> stages;
     private String defaultStage;

reckon-core/src/test/java/org/ajoberstar/reckon/core/ReckonerIntegTest.java

@@ -71,6 +71,7 @@ private String reckonStage(Scope scope, String stage) {
         .scopeCalc(i -> Optional.ofNullable(scope))
         .stageCalc((i, v) -> Optional.ofNullable(stage))
         .stages("beta", "milestone", "rc", "final")
+        .defaultInferredScope(Scope.MINOR)
         .build()
         .reckon()
         .toString();
@@ -82,6 +83,7 @@ private String reckonSnapshot(Scope scope, String stage) {
         .git(git.getRepository())
         .scopeCalc(i -> Optional.ofNullable(scope))
         .stageCalc((i, v) -> Optional.ofNullable(stage))
+        .defaultInferredScope(Scope.MINOR)
         .snapshots()
         .build()
         .reckon()

reckon-core/src/test/java/org/ajoberstar/reckon/core/ReckonerTest.java

@@ -45,6 +45,7 @@ public void stagesLowercased(String stage) {
         .scopeCalc(i -> Optional.empty())
         .stages("beTA", "miLEStone", "RC", "Final")
         .stageCalc(StageCalculator.ofUserString((i, v) -> Optional.of(stage)))
+        .defaultInferredScope(Scope.MINOR)
         .build()
         .reckon();
   }
@@ -361,6 +362,7 @@ public void doubleConflictingParallelIncrementsHigherScope() {
         .parallelBranchScope(Scope.MINOR)
         .scopeCalc(i -> Optional.ofNullable(Scope.PATCH))
         .stageCalc((i, v) -> Optional.ofNullable("final"))
+        .defaultInferredScope(Scope.MINOR)
         .stages("beta", "milestone", "rc", "final")
         .build();
 
@@ -586,6 +588,7 @@ private String reckonStage(VcsInventory inventory, Scope scope, String stage) {
         .vcs(() -> inventory)
         .scopeCalc(i -> Optional.ofNullable(scope))
         .stageCalc((i, v) -> Optional.ofNullable(stage))
+        .defaultInferredScope(Scope.MINOR)
         .stages("beta", "milestone", "rc", "final")
         .build()
         .reckon()
@@ -598,6 +601,7 @@ private String reckonSnapshot(VcsInventory inventory, Scope scope, String stage)
         .vcs(() -> inventory)
         .scopeCalc(i -> Optional.ofNullable(scope))
         .stageCalc((i, v) -> Optional.ofNullable(stage))
+        .defaultInferredScope(Scope.MINOR)
         .snapshots()
         .build()
         .reckon()

reckon-gradle/build.gradle.kts

@@ -33,6 +33,7 @@ dependencies {
 
   // testing
   compatTestImplementation(gradleTestKit())
+  compatTestImplementation("org.eclipse.jgit:org.eclipse.jgit:[6.0,7.0[")
   compatTestImplementation("org.spockframework:spock-core:2.3-groovy-3.0")
 }
 

reckon-gradle/gradle.lockfile

@@ -2,17 +2,17 @@
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
 com.github.zafarkhaja:java-semver:0.9.0=runtimeClasspath,testRuntimeClasspath
-com.googlecode.javaewah:JavaEWAH:1.1.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+com.googlecode.javaewah:JavaEWAH:1.1.13=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.apache.commons:commons-lang3:3.12.0=runtimeClasspath,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=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jgit:org.eclipse.jgit:6.5.0.202303070854-r=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.hamcrest:hamcrest:2.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.slf4j:slf4j-api:1.7.30=compileClasspath,testCompileClasspath
+org.slf4j:slf4j-api:1.7.30=compatTestCompileClasspath,compatTestRuntimeClasspath,compileClasspath,testCompileClasspath
 org.slf4j:slf4j-api:2.0.7=runtimeClasspath,testRuntimeClasspath
 org.spockframework:spock-core:2.3-groovy-3.0=compatTestCompileClasspath,compatTestRuntimeClasspath
 empty=annotationProcessor,compatTestAnnotationProcessor,signatures,testAnnotationProcessor

reckon-gradle/src/compatTest/groovy/org/ajoberstar/reckon/gradle/BaseCompatTest.groovy

@@ -41,6 +41,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
 }
@@ -91,6 +92,7 @@ plugins {
 println version
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
 }
@@ -142,6 +144,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   snapshotFromProp()
 }
@@ -165,6 +168,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
 }
@@ -190,6 +194,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   stages('alpha','beta', 'final')
   scopeCalc = calcScopeFromProp().or(calcScopeFromCommitMessages())
   stageCalc = calcStageFromProp()
@@ -216,6 +221,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   stages('alpha','beta', 'final')
   scopeCalc = calcScopeFromProp().or(calcScopeFromCommitMessages())
   stageCalc = calcStageFromProp()
@@ -242,6 +248,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
   remote = 'other-remote'
@@ -270,6 +277,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
   
@@ -301,6 +309,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
   tagMessage = version.map(v -> "Version " + v)
@@ -329,6 +338,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha', 'beta', 'final')
 }

reckon-gradle/src/compatTest/groovy/org/ajoberstar/reckon/gradle/CompositeBuildCompatTest.groovy

@@ -29,6 +29,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('beta', 'final')
 }
@@ -52,6 +53,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('beta', 'final')
 }

reckon-gradle/src/compatTest/groovy/org/ajoberstar/reckon/gradle/SettingsCompatTest.groovy

@@ -44,6 +44,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
 }
@@ -118,6 +119,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   snapshotFromProp()
 }
@@ -141,6 +143,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
 }
@@ -166,6 +169,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   stages('alpha','beta', 'final')
   scopeCalc = calcScopeFromProp().or(calcScopeFromCommitMessages())
   stageCalc = calcStageFromProp()
@@ -192,6 +196,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   stages('alpha','beta', 'final')
   scopeCalc = calcScopeFromProp().or(calcScopeFromCommitMessages())
   stageCalc = calcStageFromProp()
@@ -218,6 +223,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
   remote = 'other-remote'
@@ -246,6 +252,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
 
@@ -277,6 +284,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha','beta', 'final')
   tagMessage = version.map(v -> "Version " + v)
@@ -305,6 +313,7 @@ plugins {
 }
 
 reckon {
+  defaultInferredScope = 'minor'
   scopeFromProp()
   stageFromProp('alpha', 'beta', 'final')
 }

reckon-gradle/src/main/java/org/ajoberstar/reckon/gradle/ReckonExtension.java

@@ -185,7 +185,7 @@ private Version reckonVersion() {
     try {
       reckoner = reckonerBuilder.build();
     } catch (Exception e) {
-      throw new ReckonConfigurationException("Failed to configure Reckon.", e);
+      throw new ReckonConfigurationException("Failed to configure Reckon: " + e.getMessage(), e);
     }
 
     var version = reckoner.reckon();