diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 028d7bfa..3e9a0523 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - jvm-version: [17] + jvm-version: [ 17 ] steps: - uses: actions/checkout@v3 diff --git a/.tools/run_jvm_tests.sh b/.tools/run_jvm_tests.sh index 6a3f7bcf..a7d7205f 100755 --- a/.tools/run_jvm_tests.sh +++ b/.tools/run_jvm_tests.sh @@ -5,20 +5,20 @@ set -eufx -o pipefail SELF_PATH=${BASH_SOURCE[0]:-"$(command -v -- "$0")"} PROJECT_ROOT="$(dirname "$SELF_PATH")/.." -pushd $PROJECT_ROOT/templates/java-gradle && ./gradlew check && popd +pushd $PROJECT_ROOT/templates/java-gradle && ./gradlew --console=plain check && popd pushd $PROJECT_ROOT/templates/java-maven && mvn verify && popd -pushd $PROJECT_ROOT/templates/kotlin-gradle && ./gradlew check && popd -pushd $PROJECT_ROOT/templates/kotlin-gradle-lambda-cdk/lambda && ./gradlew check && popd +pushd $PROJECT_ROOT/templates/kotlin-gradle && ./gradlew --console=plain check && popd +pushd $PROJECT_ROOT/templates/kotlin-gradle-lambda-cdk/lambda && ./gradlew --console=plain check && popd -pushd $PROJECT_ROOT/basics/basics-java && ./gradlew check && popd -pushd $PROJECT_ROOT/basics/basics-kotlin && ./gradlew check && popd +pushd $PROJECT_ROOT/basics/basics-java && ./gradlew --console=plain check && popd +pushd $PROJECT_ROOT/basics/basics-kotlin && ./gradlew --console=plain check && popd -pushd $PROJECT_ROOT/patterns-use-cases/sagas/sagas-java && ./gradlew check && popd -pushd $PROJECT_ROOT/patterns-use-cases/payment-state-machine/payment-state-machine-java && ./gradlew check && popd -pushd $PROJECT_ROOT/patterns-use-cases/async-signals-payment/async-signals-payment-java && ./gradlew check && popd -pushd $PROJECT_ROOT/patterns-use-cases/integrations/java-spring && ./gradlew check && popd +pushd $PROJECT_ROOT/patterns-use-cases/sagas/sagas-java && ./gradlew --console=plain check && popd +pushd $PROJECT_ROOT/patterns-use-cases/payment-state-machine/payment-state-machine-java && ./gradlew --console=plain check && popd +pushd $PROJECT_ROOT/patterns-use-cases/async-signals-payment/async-signals-payment-java && ./gradlew --console=plain check && popd +pushd $PROJECT_ROOT/patterns-use-cases/integrations/java-spring && ./gradlew --console=plain check && popd -pushd $PROJECT_ROOT/tutorials/tour-of-restate-java && ./gradlew check && popd +pushd $PROJECT_ROOT/tutorials/tour-of-restate-java && ./gradlew --console=plain check && popd -pushd $PROJECT_ROOT/end-to-end-applications/java/food-ordering/app && ./gradlew check && popd -pushd $PROJECT_ROOT/end-to-end-applications/kotlin/food-ordering/app && ./gradlew check && popd +pushd $PROJECT_ROOT/end-to-end-applications/java/food-ordering/app && ./gradlew --console=plain check && popd +pushd $PROJECT_ROOT/end-to-end-applications/kotlin/food-ordering/app && ./gradlew --console=plain check && popd diff --git a/basics/basics-kotlin/settings.gradle.kts b/basics/basics-kotlin/settings.gradle.kts new file mode 100644 index 00000000..cb3e4a47 --- /dev/null +++ b/basics/basics-kotlin/settings.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} \ No newline at end of file diff --git a/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts index c0be405d..cd329290 100644 --- a/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts +++ b/end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts @@ -52,6 +52,7 @@ tasks.withType { // Code formatting tool spotless { + isEnforceCheck = false java { importOrder() removeUnusedImports() diff --git a/end-to-end-applications/java/food-ordering/app/settings.gradle.kts b/end-to-end-applications/java/food-ordering/app/settings.gradle.kts index 37474bef..96b338e9 100644 --- a/end-to-end-applications/java/food-ordering/app/settings.gradle.kts +++ b/end-to-end-applications/java/food-ordering/app/settings.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} + rootProject.name = "food-ordering-app" include("restaurant", "restate-app") diff --git a/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts index 12efff77..65aec0e2 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts @@ -23,6 +23,7 @@ subprojects { // Code formatting tool spotless { + isEnforceCheck = false kotlin { targetExclude("build/generated/**/*.kt") ktfmt() diff --git a/end-to-end-applications/kotlin/food-ordering/app/settings.gradle.kts b/end-to-end-applications/kotlin/food-ordering/app/settings.gradle.kts index 37474bef..96b338e9 100644 --- a/end-to-end-applications/kotlin/food-ordering/app/settings.gradle.kts +++ b/end-to-end-applications/kotlin/food-ordering/app/settings.gradle.kts @@ -1,3 +1,7 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} + rootProject.name = "food-ordering-app" include("restaurant", "restate-app") diff --git a/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts b/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts index 50297607..ff009206 100644 --- a/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts +++ b/patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts @@ -54,6 +54,7 @@ java { spotless { + isEnforceCheck = false java { importOrder() removeUnusedImports() diff --git a/patterns-use-cases/async-signals-payment/async-signals-payment-java/settings.gradle.kts b/patterns-use-cases/async-signals-payment/async-signals-payment-java/settings.gradle.kts new file mode 100644 index 00000000..cb3e4a47 --- /dev/null +++ b/patterns-use-cases/async-signals-payment/async-signals-payment-java/settings.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} \ No newline at end of file diff --git a/patterns-use-cases/integrations/java-spring/build.gradle.kts b/patterns-use-cases/integrations/java-spring/build.gradle.kts index b8ada5ff..e71bed15 100644 --- a/patterns-use-cases/integrations/java-spring/build.gradle.kts +++ b/patterns-use-cases/integrations/java-spring/build.gradle.kts @@ -52,6 +52,7 @@ tasks.withType { } spotless { + isEnforceCheck = false java { googleJavaFormat() importOrder() diff --git a/patterns-use-cases/integrations/java-spring/settings.gradle.kts b/patterns-use-cases/integrations/java-spring/settings.gradle.kts index 1b16c0d9..d73d5e1e 100644 --- a/patterns-use-cases/integrations/java-spring/settings.gradle.kts +++ b/patterns-use-cases/integrations/java-spring/settings.gradle.kts @@ -1 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} + rootProject.name = "java-spring" diff --git a/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts b/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts index 4556c040..4de1bc94 100644 --- a/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts +++ b/patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts @@ -50,6 +50,7 @@ java { } spotless { + isEnforceCheck = false java { importOrder() removeUnusedImports() diff --git a/patterns-use-cases/payment-state-machine/payment-state-machine-java/settings.gradle.kts b/patterns-use-cases/payment-state-machine/payment-state-machine-java/settings.gradle.kts new file mode 100644 index 00000000..cb3e4a47 --- /dev/null +++ b/patterns-use-cases/payment-state-machine/payment-state-machine-java/settings.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} \ No newline at end of file diff --git a/patterns-use-cases/sagas/sagas-java/settings.gradle.kts b/patterns-use-cases/sagas/sagas-java/settings.gradle.kts new file mode 100644 index 00000000..cb3e4a47 --- /dev/null +++ b/patterns-use-cases/sagas/sagas-java/settings.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} \ No newline at end of file diff --git a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts index 9317ac5d..19ca4434 100644 --- a/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts +++ b/patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts @@ -31,6 +31,6 @@ dependencies { // Setup Java/Kotlin compiler target java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(11)) } } diff --git a/patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts b/patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts new file mode 100644 index 00000000..cb3e4a47 --- /dev/null +++ b/patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} \ No newline at end of file diff --git a/templates/java-maven/pom.xml b/templates/java-maven/pom.xml index be46de17..f08a29f1 100644 --- a/templates/java-maven/pom.xml +++ b/templates/java-maven/pom.xml @@ -13,8 +13,8 @@ UTF-8 - 17 - 17 + 11 + 11 1.0.1 diff --git a/templates/kotlin-gradle/settings.gradle.kts b/templates/kotlin-gradle/settings.gradle.kts new file mode 100644 index 00000000..cb3e4a47 --- /dev/null +++ b/templates/kotlin-gradle/settings.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0") +} \ No newline at end of file