GH-1960 Downgrade to JDK20 & Kotlin 1.9.10

dzikoysk · Oct 23, 2023 · 8b70c40 · 8b70c40
1 parent e99a728
commit 8b70c40
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         # Use 11 LTS releases and the latest one
-        java-version: [ 11, 21 ]
+        java-version: [ 11, 20 ]
     steps:
     - name: "Checkout repository"
       uses: actions/checkout@v3

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -3,7 +3,7 @@ name: "Publish releases"
 on: workflow_dispatch
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 20
 
 jobs:
   github:

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -5,7 +5,7 @@ on:
     branches: [ "main" ]
 
 env:
-  JAVA_VERSION: 21
+  JAVA_VERSION: 20
 
 jobs:
   maven:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build stage
-FROM openjdk:21-slim AS build
+FROM openjdk:20-slim AS build
 COPY . /home/reposilite-build
 WORKDIR /home/reposilite-build
 RUN \
@@ -24,7 +24,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0"
 
 # Run stage
-FROM openjdk:21-slim
+FROM openjdk:20-slim
 RUN mkdir -p /app/data && mkdir -p /var/log/reposilite
 VOLUME /app/data
 WORKDIR /app

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
     application
     `maven-publish`
 
-    val kotlinVersion = "1.9.20-RC"
+    val kotlinVersion = "1.9.10"
     kotlin("jvm") version kotlinVersion
     kotlin("kapt") version kotlinVersion
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -15,7 +15,7 @@
  */
 
 plugins {
-    kotlin("jvm") version "1.9.20-RC"
+//    kotlin("jvm") version "1.9.20-RC"
     `kotlin-dsl`
 }
 
@@ -29,6 +29,6 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+//        languageVersion.set(JavaLanguageVersion.of(21))
     }
 }
diff --git a/reposilite-backend/build.gradle.kts b/reposilite-backend/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     val detekt = "1.23.0"
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:$detekt")
 
-    val kotlin = "1.9.20-RC"
+    val kotlin = "1.9.10"
     implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin")
 
@@ -208,7 +208,7 @@ jacoco {
 
 tasks.test {
     extensions.configure(JacocoTaskExtension::class) {
-        setDestinationFile(file("${layout.buildDirectory}/jacoco/jacoco.exec"))
+        setDestinationFile(file("${project.layout.buildDirectory.get()}/jacoco/jacoco.exec"))
     }
 
     finalizedBy("jacocoTestReport")
@@ -222,7 +222,7 @@ tasks.jacocoTestReport {
         xml.outputLocation.set(file("./build/reports/jacoco/reposilite-backend-report.xml"))
     }
 
-    executionData(fileTree(project.layout.buildDirectory).include("jacoco/*.exec"))
+    executionData(fileTree(project.layout.buildDirectory.get()).include("jacoco/*.exec"))
     finalizedBy("jacocoTestCoverageVerification")
 }
 

diff --git a/reposilite-frontend/build.gradle.kts b/reposilite-frontend/build.gradle.kts
@@ -44,7 +44,7 @@ val buildTask = tasks.register<NpmTask>("buildFrontend") {
     inputs.dir(project.fileTree("src"))
     inputs.dir("node_modules")
     inputs.files("vite.config.js", "windi.config.js", "index.html")
-    outputs.dir("${project.buildDir}/frontend")
+    outputs.dir("${project.layout.buildDirectory.get()}/frontend")
 }
 
 sourceSets {