Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix all the JVM toolchain stuff #191

Merged
merged 6 commits into from
Sep 4, 2024
Merged

Fix all the JVM toolchain stuff #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f199be3
Fix all the JVM toolchain stuff
slinkydeveloper Sep 4, 2024
c3a4c07
Don't enforce checks
slinkydeveloper Sep 4, 2024
0540879
The template should pull a reasonable java version
slinkydeveloper Sep 4, 2024
b43c697
Use console plain when running gradle, to rmeove the noise.
slinkydeveloper Sep 4, 2024
90085f3
Neverthless use JVM 17 on CI
slinkydeveloper Sep 4, 2024
d4b5fe6
Just stay on 17 when we have the foojay toolchain resolver.
slinkydeveloper Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
jvm-version: [17]
jvm-version: [ 17 ]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't ultimately downgrade this to 11 because of spring-projects/spring-boot#33365


steps:
- uses: actions/checkout@v3
Expand Down
24 changes: 12 additions & 12 deletions .tools/run_jvm_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions basics/basics-kotlin/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}
1 change: 1 addition & 0 deletions end-to-end-applications/java/food-ordering/app/restate-app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ tasks.withType<JavaCompile> {

// Code formatting tool
spotless {
isEnforceCheck = false
java {
importOrder()
removeUnusedImports()
Expand Down
4 changes: 4 additions & 0 deletions end-to-end-applications/java/food-ordering/app/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
1 change: 1 addition & 0 deletions end-to-end-applications/kotlin/food-ordering/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ subprojects {

// Code formatting tool
spotless {
isEnforceCheck = false
kotlin {
targetExclude("build/generated/**/*.kt")
ktfmt()
Expand Down
4 changes: 4 additions & 0 deletions end-to-end-applications/kotlin/food-ordering/app/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
1 change: 1 addition & 0 deletions patterns-use-cases/async-signals-payment/async-signals-payment-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ java {


spotless {
isEnforceCheck = false
java {
importOrder()
removeUnusedImports()
Expand Down
3 changes: 3 additions & 0 deletions patterns-use-cases/async-signals-payment/async-signals-payment-java/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}
1 change: 1 addition & 0 deletions patterns-use-cases/integrations/java-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ tasks.withType<Test> {
}

spotless {
isEnforceCheck = false
java {
googleJavaFormat()
importOrder()
Expand Down
4 changes: 4 additions & 0 deletions patterns-use-cases/integrations/java-spring/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}

rootProject.name = "java-spring"
1 change: 1 addition & 0 deletions patterns-use-cases/payment-state-machine/payment-state-machine-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ java {
}

spotless {
isEnforceCheck = false
java {
importOrder()
removeUnusedImports()
Expand Down
3 changes: 3 additions & 0 deletions patterns-use-cases/payment-state-machine/payment-state-machine-java/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}
3 changes: 3 additions & 0 deletions patterns-use-cases/sagas/sagas-java/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}
2 changes: 1 addition & 1 deletion patterns-use-cases/sagas/sagas-kotlin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ dependencies {
// Setup Java/Kotlin compiler target
java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(17))
languageVersion.set(JavaLanguageVersion.of(11))
}
}
3 changes: 3 additions & 0 deletions patterns-use-cases/sagas/sagas-kotlin/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}
4 changes: 2 additions & 2 deletions templates/java-maven/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<restate.version>1.0.1</restate.version>
</properties>

Expand Down
3 changes: 3 additions & 0 deletions templates/kotlin-gradle/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
}
Loading