From bd8f56f0ddac22246690a2070cd93f38df800d02 Mon Sep 17 00:00:00 2001 From: ybelMekk Date: Wed, 19 Oct 2022 22:07:49 +0200 Subject: [PATCH] fix(build.gradle.kts, workflows): rewind java version -> 11 --- .github/workflows/build-master.yml | 4 ++-- .github/workflows/dokka.yml | 4 ++-- .github/workflows/manual_testing.yml | 4 ++-- .github/workflows/publish-release.yml | 4 ++-- .github/workflows/test-pull-requests.yml | 4 ++-- build.gradle.kts | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml index 99fb4448..6412a704 100644 --- a/.github/workflows/build-master.yml +++ b/.github/workflows/build-master.yml @@ -12,10 +12,10 @@ jobs: - name: Checkout latest code uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'zulu' cache: 'gradle' diff --git a/.github/workflows/dokka.yml b/.github/workflows/dokka.yml index bc3dd433..19da6fda 100644 --- a/.github/workflows/dokka.yml +++ b/.github/workflows/dokka.yml @@ -14,10 +14,10 @@ jobs: - name: Checkout latest code uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'zulu' cache: 'gradle' diff --git a/.github/workflows/manual_testing.yml b/.github/workflows/manual_testing.yml index aa1f1bf2..12f595f7 100644 --- a/.github/workflows/manual_testing.yml +++ b/.github/workflows/manual_testing.yml @@ -15,10 +15,10 @@ jobs: with: ref: add-arm64-architecture - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'zulu' cache: 'gradle' diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 2cb90446..59f40801 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -15,10 +15,10 @@ jobs: - name: Checkout latest code uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'zulu' cache: 'gradle' diff --git a/.github/workflows/test-pull-requests.yml b/.github/workflows/test-pull-requests.yml index b987af91..20671ed1 100644 --- a/.github/workflows/test-pull-requests.yml +++ b/.github/workflows/test-pull-requests.yml @@ -9,10 +9,10 @@ jobs: - name: Checkout latest code uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: - java-version: 17 + java-version: 11 distribution: 'zulu' cache: 'gradle' diff --git a/build.gradle.kts b/build.gradle.kts index fbac3b37..9e125bd4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,8 +41,8 @@ application { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 withJavadocJar() withSourcesJar() } @@ -73,7 +73,7 @@ dependencies { testImplementation("io.kotest:kotest-assertions-core-jvm:$kotestVersion") // for kotest core jvm assertions testImplementation("org.jetbrains.kotlin:kotlin-test-junit5:$kotlinVersion") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion") - //example use with different frameworks + // example use with different frameworks testImplementation("org.springframework.boot:spring-boot-starter-webflux:$springBootVersion") testImplementation("org.springframework.boot:spring-boot-starter-oauth2-resource-server:$springBootVersion") testImplementation("org.springframework.boot:spring-boot-starter-oauth2-client:$springBootVersion") @@ -188,7 +188,7 @@ jib { os = "linux" } } - image = "gcr.io/distroless/java17-debian11" + image = "gcr.io/distroless/java11-debian11" } container { ports = listOf("8080") @@ -255,7 +255,7 @@ tasks { withType { kotlinOptions { - jvmTarget = "17" + jvmTarget = JavaVersion.VERSION_11.toString() } } @@ -274,6 +274,6 @@ tasks { } withType { - gradleVersion = "7.5.1" + gradleVersion = "7.4.2" } }