Skip to content

Commit

Permalink
GH-1960 Gradle 8.4 & JDK 21 on CI
Browse files Browse the repository at this point in the history
  • Loading branch information
dzikoysk committed Oct 23, 2023
1 parent e3bb979 commit b72e146
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
# Use 11 LTS releases and the latest one
java-version: [ 11, 19 ]
java-version: [ 11, 21 ]
steps:
- name: "Checkout repository"
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: "Publish releases"
on: workflow_dispatch

env:
JAVA_VERSION: 19
JAVA_VERSION: 21

jobs:
github:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches: [ "main" ]

env:
JAVA_VERSION: 19
JAVA_VERSION: 21

jobs:
maven:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build stage
FROM openjdk:19-slim AS build
FROM openjdk:21-slim AS build
COPY . /home/reposilite-build
WORKDIR /home/reposilite-build
RUN \
Expand All @@ -24,7 +24,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.schema-version="1.0"

# Run stage
FROM openjdk:19-slim
FROM openjdk:21-slim
RUN mkdir -p /app/data && mkdir -p /var/log/reposilite
VOLUME /app/data
WORKDIR /app
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 3 additions & 3 deletions reposilite-backend/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies {
implementation("org.jetbrains.kotlin:kotlin-reflect:$kotlin")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin")

val javalin = "5.6.2"
val javalin = "5.6.3"
api("io.javalin:javalin:$javalin")
api("io.javalin.community.ssl:ssl-plugin:$javalin")

Expand Down Expand Up @@ -208,7 +208,7 @@ jacoco {

tasks.test {
extensions.configure(JacocoTaskExtension::class) {
destinationFile = file("$buildDir/jacoco/jacoco.exec")
setDestinationFile(file("${layout.buildDirectory}/jacoco/jacoco.exec"))
}

finalizedBy("jacocoTestReport")
Expand All @@ -222,7 +222,7 @@ tasks.jacocoTestReport {
xml.outputLocation.set(file("./build/reports/jacoco/reposilite-backend-report.xml"))
}

executionData(fileTree(project.buildDir).include("jacoco/*.exec"))
executionData(fileTree(project.layout.buildDirectory).include("jacoco/*.exec"))
finalizedBy("jacocoTestCoverageVerification")
}

Expand Down
2 changes: 1 addition & 1 deletion reposilite-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
"xml-js": "^1.6.11",
"xml2js": "^0.6.2"
}
}
}

0 comments on commit b72e146

Please sign in to comment.