From f199be37088a0632231bc403b242d8c8f6e755cd Mon Sep 17 00:00:00 2001 From: slinkydeveloper Date: Wed, 4 Sep 2024 09:50:51 +0200 Subject: [PATCH] Fix all the JVM toolchain stuff --- .github/workflows/test.yml | 2 +- basics/basics-kotlin/build.gradle.kts | 2 +- basics/basics-kotlin/settings.gradle.kts | 3 +++ .../java/food-ordering/app/build.gradle.kts | 2 +- .../java/food-ordering/app/settings.gradle.kts | 4 ++++ .../kotlin/food-ordering/app/settings.gradle.kts | 4 ++++ .../async-signals-payment-java/settings.gradle.kts | 3 +++ .../integrations/java-spring/settings.gradle.kts | 4 ++++ .../payment-state-machine-java/settings.gradle.kts | 3 +++ patterns-use-cases/sagas/sagas-java/settings.gradle.kts | 3 +++ patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts | 2 +- patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts | 3 +++ templates/java-maven/pom.xml | 4 ++-- templates/kotlin-gradle/build.gradle.kts | 2 +- templates/kotlin-gradle/settings.gradle.kts | 3 +++ 15 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 basics/basics-kotlin/settings.gradle.kts create mode 100644 patterns-use-cases/async-signals-payment/async-signals-payment-java/settings.gradle.kts create mode 100644 patterns-use-cases/payment-state-machine/payment-state-machine-java/settings.gradle.kts create mode 100644 patterns-use-cases/sagas/sagas-java/settings.gradle.kts create mode 100644 patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts create mode 100644 templates/kotlin-gradle/settings.gradle.kts diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 028d7bfa..be0112b6 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: [ 11 ] steps: - uses: actions/checkout@v3 diff --git a/basics/basics-kotlin/build.gradle.kts b/basics/basics-kotlin/build.gradle.kts index 0d0e7829..e3c4ccc7 100644 --- a/basics/basics-kotlin/build.gradle.kts +++ b/basics/basics-kotlin/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { // Setup Java/Kotlin compiler target java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(11)) } } 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/build.gradle.kts b/end-to-end-applications/java/food-ordering/app/build.gradle.kts index 43d91a3f..1b2d734a 100644 --- a/end-to-end-applications/java/food-ordering/app/build.gradle.kts +++ b/end-to-end-applications/java/food-ordering/app/build.gradle.kts @@ -12,7 +12,7 @@ allprojects { java { // Configure the java toolchain to use. If not found, it will be downloaded automatically - toolchain { languageVersion = JavaLanguageVersion.of(17) } + toolchain { languageVersion = JavaLanguageVersion.of(11) } } } 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/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/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/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/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/build.gradle.kts b/templates/kotlin-gradle/build.gradle.kts index 6843d16d..03c09630 100644 --- a/templates/kotlin-gradle/build.gradle.kts +++ b/templates/kotlin-gradle/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { // Setup Java/Kotlin compiler target java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(11)) } } 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