build: update dependencies & gradle wrapper

Citymonstret · Citymonstret · commit 35ab865662dd · 2024-06-08T15:04:33.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,15 +13,15 @@ jobs:
         runs-on: "ubuntu-latest"
         steps:
             - uses: actions/checkout@v4
-            - uses: gradle/wrapper-validation-action@v1
+            - uses: gradle/actions/wrapper-validation@v3
             - name: Set up JDK
               uses: actions/setup-java@v4
               with:
                   distribution: 'temurin'
-                  java-version: 17
-            - uses: gradle/gradle-build-action@v2
+                  java-version: 21
+            - uses: gradle/actions/setup-gradle@v3
               with:
-                  # allow main and *-dev branches to write caches (default is only main/main)
+                  # allow master and *-dev branches to write caches (default is only master/main)
                   cache-read-only: ${{ github.ref != 'refs/heads/main' && !(endsWith(github.ref, '-dev') && startsWith(github.ref, 'refs/heads/')) }}
             - name: Build
               run: ./gradlew build
diff --git a/cloud-spring/src/test/java/org/incendo/cloud/spring/ShellIntegrationTest.java b/cloud-spring/src/test/java/org/incendo/cloud/spring/ShellIntegrationTest.java
@@ -126,7 +126,7 @@ static class TestCommand extends CommandBean<SpringCommandSender> {
         protected Command.Builder<SpringCommandSender> configure(final Command.Builder<SpringCommandSender> builder) {
             return builder.commandDescription(CommandDescription.commandDescription("Description!"))
                     .required("string", stringParser())
-                    .flag(CommandFlag.builder("flag").withComponent(integerParser()));
+                    .flag(CommandFlag.builder("flag").withComponent(integerParser()).build());
         }
 
         @Override
diff --git a/example/src/main/java/org/incendo/cloud/spring/example/commands/AddCatCommand.java b/example/src/main/java/org/incendo/cloud/spring/example/commands/AddCatCommand.java
@@ -30,7 +30,6 @@
 import org.incendo.cloud.bean.CommandProperties;
 import org.incendo.cloud.context.CommandContext;
 import org.incendo.cloud.meta.CommandMeta;
-import org.incendo.cloud.parser.ArgumentParseResult;
 import org.incendo.cloud.parser.aggregate.AggregateParser;
 import org.incendo.cloud.parser.flag.CommandFlag;
 import org.incendo.cloud.spring.CloudCompletionProposal;
@@ -84,8 +83,7 @@ public AddCatCommand(final @NonNull CatService catService) {
                         CloudCompletionProposal.of("Fluffy").displayText("Fluffy (A classic :))")
                 )))
                 .withComponent("age", integerParser(0))
-                .withDirectMapper(Cat.class, (cmxCtx, ctx) -> ArgumentParseResult.success(new Cat(ctx.get("name"),
-                        ctx.get("age"))))
+                .withDirectMapper(Cat.class, (cmxCtx, ctx) -> new Cat(ctx.get("name"), ctx.get("age")))
                 .build();
 
         return builder.literal("add")
diff --git a/example/src/main/java/org/incendo/cloud/spring/example/commands/RemoveCatCommand.java b/example/src/main/java/org/incendo/cloud/spring/example/commands/RemoveCatCommand.java
@@ -68,7 +68,7 @@ public RemoveCatCommand(final @NonNull CatService catService) {
     protected Command.Builder<SpringCommandSender> configure(final Command.Builder<SpringCommandSender> builder) {
         return builder.literal("remove")
                 .required("name", stringParser(), SuggestionProvider.blocking((ctx, in) ->
-                        this.catService.cats().stream().map(Cat::name).map(Suggestion::simple).collect(Collectors.toList())))
+                        this.catService.cats().stream().map(Cat::name).map(Suggestion::suggestion).collect(Collectors.toList())))
                 .commandDescription(commandDescription("Remove a cat"));
     }
 
diff --git a/example/src/main/resources/application.yml b/example/src/main/resources/application.yml
@@ -10,6 +10,10 @@ spring:
         log-startup-info: false
         banner-mode: off
 
+    shell:
+        interactive:
+          enabled: true
+
 logging:
     level:
         org.incendo: info
diff --git a/gradle/build-logic/src/main/kotlin/cloud-spring.base-conventions.gradle.kts b/gradle/build-logic/src/main/kotlin/cloud-spring.base-conventions.gradle.kts
@@ -5,9 +5,9 @@ plugins {
 
 indra {
     javaVersions {
-        minimumToolchain(17)
-        target(17)
-        testWith().set(setOf(17))
+        minimumToolchain(21)
+        target(21)
+        testWith().set(setOf(21))
     }
     checkstyle().set(libs.versions.checkstyle)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,21 +6,21 @@ cloud-buildLogic-rootProject-publishing = { id = "org.incendo.cloud-build-logic.
 cloud-buildLogic-rootProject-spotless = { id = "org.incendo.cloud-build-logic.spotless.root-project", version.ref = "cloud-build-logic" }
 
 [versions]
-cloud-build-logic = "0.0.8-SNAPSHOT"
-springBoot = "3.2.2"
-ktlint = "1.0.1"
-checkstyle = "10.12.5"
-kotlin = "1.9.22"
+cloud-build-logic = "0.0.15"
+springBoot = "3.3.0"
+ktlint = "1.3.0"
+checkstyle = "10.17.0"
+kotlin = "1.9.24"
 graal = "0.9.28"
 
-slf4j = "2.0.12"
-cloud = "2.0.0-beta.1"
+slf4j = "2.0.13"
+cloud = "2.0.0-rc.2"
 
-springShellBom = "3.2.1"
+springShellBom = "3.3.0"
 
 # Test
-truth = "1.4.0"
-awaitility = "4.2.0"
+truth = "1.4.2"
+awaitility = "4.2.1"
 
 [libraries]
 cloud-build-logic = { module = "org.incendo:cloud-build-logic", version.ref = "cloud-build-logic" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ static class TestCommand extends CommandBean<SpringCommandSender> {`
`126`	`126`	`protected Command.Builder<SpringCommandSender> configure(final Command.Builder<SpringCommandSender> builder) {`
`127`	`127`	`return builder.commandDescription(CommandDescription.commandDescription("Description!"))`
`128`	`128`	`.required("string", stringParser())`
`129`		`- .flag(CommandFlag.builder("flag").withComponent(integerParser()));`
	`129`	`+ .flag(CommandFlag.builder("flag").withComponent(integerParser()).build());`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public RemoveCatCommand(final @NonNull CatService catService) {`
`68`	`68`	`protected Command.Builder<SpringCommandSender> configure(final Command.Builder<SpringCommandSender> builder) {`
`69`	`69`	`return builder.literal("remove")`
`70`	`70`	`.required("name", stringParser(), SuggestionProvider.blocking((ctx, in) ->`
`71`		`- this.catService.cats().stream().map(Cat::name).map(Suggestion::simple).collect(Collectors.toList())))`
	`71`	`+ this.catService.cats().stream().map(Cat::name).map(Suggestion::suggestion).collect(Collectors.toList())))`
`72`	`72`	`.commandDescription(commandDescription("Remove a cat"));`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ plugins {`
`5`	`5`
`6`	`6`	`indra {`
`7`	`7`	`javaVersions {`
`8`		`- minimumToolchain(17)`
`9`		`- target(17)`
`10`		`- testWith().set(setOf(17))`
	`8`	`+ minimumToolchain(21)`
	`9`	`+ target(21)`
	`10`	`+ testWith().set(setOf(21))`
`11`	`11`	`}`
`12`	`12`	`checkstyle().set(libs.versions.checkstyle)`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`	`# Darwin, MinGW, and NonStop.`
`56`	`56`	`#`
`57`	`57`	`# (3) This script is generated from the Groovy template`
`58`		`-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
	`58`	`+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
`59`	`59`	`# within the Gradle project.`
`60`	`60`	`#`
`61`	`61`	`# You can find Gradle at https://github.com/gradle/gradle/.`