Skip to content

Commit

Permalink
Upgrade to jdk17 (#245)
Browse files Browse the repository at this point in the history
Co-authored-by: Antonio Murgia <[email protected]>
  • Loading branch information
tmnd1991 and agilelab-tmnd1991 authored Mar 26, 2024
1 parent 305523b commit ca73886
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
with:
cache: 'gradle'
distribution: temurin
java-version: 11
java-version: 17
- name: Setup Gradle
uses: gradle/gradle-build-action@v3
- name: Execute Gradle build
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repositories {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

Expand Down
29 changes: 25 additions & 4 deletions client-spark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
testImplementation("io.delta:delta-sharing-spark_2.13")

//SPARK
testImplementation( "org.apache.spark:spark-sql_2.13")
testImplementation("org.apache.spark:spark-sql_2.13")
testImplementation("com.github.mrpowers:spark-fast-tests_2.13:1.3.0")

//JUNIT
Expand All @@ -39,13 +39,32 @@ tasks.getByName<Test>("test") {

tasks.withType<Test> {
environment = env.allVariables()
systemProperty ("java.util.logging.manager", "java.util.logging.LogManager") //TODO modularize the whitefox-conventions plugin
systemProperty(
"java.util.logging.manager",
"java.util.logging.LogManager"
) //TODO modularize the whitefox-conventions plugin
}

tasks.register<Test>("clientSparkTest") {
useJUnitPlatform {
includeTags.add("clientSparkTest")
}
jvmArgs(
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.lang.invoke=ALL-UNNAMED",
"--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.io=ALL-UNNAMED",
"--add-opens=java.base/java.net=ALL-UNNAMED",
"--add-opens=java.base/java.nio=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.util.concurrent=ALL-UNNAMED",
"--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
"--add-opens=java.base/sun.nio.cs=ALL-UNNAMED",
"--add-opens=java.base/sun.security.action=ALL-UNNAMED",
"--add-opens=java.base/sun.util.calendar=ALL-UNNAMED",
"--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED"
)
}

val openApiCodeGenDir = "generated/openapi"
Expand All @@ -57,7 +76,8 @@ val whiteFoxGenerate = tasks.register<GenerateTask>("openapiGenerateClientApi")
inputSpec.set("$rootDir/protocol/whitefox-protocol-api.yml")
library.set("native")
outputDir.set(generatedCodeDirectory)
additionalProperties.set(mapOf(
additionalProperties.set(
mapOf(
"apiPackage" to "io.whitefox.api.client",
"invokerPackage" to "io.whitefox.api.utils",
"modelPackage" to "io.whitefox.api.client.model",
Expand All @@ -68,7 +88,8 @@ val whiteFoxGenerate = tasks.register<GenerateTask>("openapiGenerateClientApi")
"serializationLibrary" to "jackson",
"useJakartaEe" to "true",
"useRuntimeException" to "true"
))
)
)
}

sourceSets {
Expand Down

0 comments on commit ca73886

Please sign in to comment.