Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ jobs:
- name: Set up Java
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
with:
java-version: "11"
java-version: "17"
distribution: "temurin"

- name: Set up Gradle
uses: gradle/actions/setup-gradle@ac396bf1a80af16236baf54bd7330ae21dc6ece5 # v6

- name: Run copyright and code format checks
run: ./gradlew --no-daemon spotlessCheck
9 changes: 2 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,8 @@ subprojects {
}

java {
if(project.property("springBootPluginVersion") == "2.7.13") {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
} else {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

ext {
Expand Down
2 changes: 1 addition & 1 deletion docker/github/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM eclipse-temurin:11-focal
FROM eclipse-temurin:17-jammy

# Git is needed in order to update the dls submodule
RUN apt-get update && apt-get install -y wget protobuf-compiler git
Expand Down
6 changes: 1 addition & 5 deletions springboot-basic/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ dependencies {
runtimeOnly "io.micrometer:micrometer-registry-prometheus"
dependencies {
errorproneJavac('com.google.errorprone:javac:9+181-r4173-1')
if (JavaVersion.current().isJava11Compatible()) {
errorprone('com.google.errorprone:error_prone_core:2.28.0')
} else {
errorprone('com.google.errorprone:error_prone_core:2.28.0')
}
errorprone('com.google.errorprone:error_prone_core:2.28.0')
}
}

Expand Down
Loading