Skip to content

Commit

Permalink
chore: bump project deps and update to Java 21
Browse files Browse the repository at this point in the history
  • Loading branch information
eliasmueller committed Dec 4, 2024
1 parent dde3d8f commit 17007ab
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4

- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 21

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
Expand Down
6 changes: 3 additions & 3 deletions clara-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ val dockerImageName = "ghcr.io/ccims/${project.name}"
val buildInformation = BuildInformation(project)

kotlin {
jvmToolchain(17)
jvmToolchain(21)
}

dependencies {
Expand All @@ -53,7 +53,7 @@ dependencies {
implementation(libs.kotlinx.coroutines.core)
implementation(libs.opentelemetry.api)
implementation(libs.graphql.client)
implementation("io.netty:netty-resolver-dns-native-macos:4.1.107.Final:osx-aarch_64")
implementation("io.netty:netty-resolver-dns-native-macos:4.1.115.Final:osx-aarch_64")
implementation(libs.bundles.logging)
implementation(libs.bundles.grpc)

Expand Down Expand Up @@ -176,7 +176,7 @@ val createDockerfile by tasks.creating(Dockerfile::class) {

// create the minified JRE

from("eclipse-temurin:17-alpine as jre-build-stage")
from("eclipse-temurin:21-alpine as jre-build-stage")

runCommand(
"\$JAVA_HOME/bin/jlink" +
Expand Down
2 changes: 1 addition & 1 deletion clara-integration-tests/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
group = "de.unistuttgart.iste.sqa.clara"

kotlin {
jvmToolchain(17)
jvmToolchain(21)
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion docs/content/setup/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ These instructions will walk you through the initial installation and setup of t
git clone [email protected]:ccims/clara.git
```
!!! warning "Java Installation"
Make sure you have at least a Java 17 JVM installed and configured on your machine.
Make sure you have at least a Java 21 JVM installed and configured on your machine.

### 1.2. kube-api

Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
devShells = forEachSupportedSystem ({ pkgs }: {
default = pkgs.mkShell {
packages = with pkgs; [
temurin-bin-17
temurin-bin-21
graphviz
ktunnel
kubectl
Expand Down
30 changes: 15 additions & 15 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
// Apply the foojay-resolver plugin to allow automatic download of JDKs.
// This cannot come from the version catalog because it itself is defined in this file.
id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
}

rootProject.name = "clara"
Expand All @@ -25,10 +25,10 @@ dependencyResolutionManagement {
}

fun VersionCatalogBuilder.declaredGradlePlugins() {
val gradlePluginKotlinVersion = version("gradle-kotlin-plugin", "1.9.22")
val gradlePluginKotlinVersion = version("gradle-kotlin-plugin", "2.1.0")
val gradlePluginDockerVersion = version("gradle-docker-plugin", "9.4.0")
val gradlePluginProtobufVersion = version("gradle-protobuf-plugin", "0.9.4")
val gradlePluginGraphQLVersion = version("gradle-graphql-plugin", "7.0.2")
val gradlePluginGraphQLVersion = version("gradle-graphql-plugin", "8.2.1")

plugin("kotlin", "org.jetbrains.kotlin.jvm").versionRef(gradlePluginKotlinVersion)
plugin("docker", "com.bmuschko.docker-remote-api").versionRef(gradlePluginDockerVersion)
Expand All @@ -37,19 +37,19 @@ fun VersionCatalogBuilder.declaredGradlePlugins() {
}

fun VersionCatalogBuilder.declaredLibraries() {
val hopliteVersion = version("hoplite", "2.8.0.RC3")
val arrowVersion = version("arrow", "1.2.1")
val kotlinLoggingVersion = version("kotlin-logging", "6.0.1")
val logbackClassicVersion = version("logback-classic", "1.4.14")
val fabric8Version = version("fabric8", "6.10.0")
val kotestVersion = version("kotest", "5.8.0")
val kotlinxCoroutineVersion = version("kotlinx-coroutine", "1.8.0-RC2") // TODO: needed because of the support for Kotlin 1.9.22; update to stable when available
val opentelemetryVersion = version("opentelemetry", "1.34.0")
val graphQLVersion = version("graphql", "7.0.2")

val grpcVersion = version("grpc", "1.60.1")
val hopliteVersion = version("hoplite", "2.9.0")
val arrowVersion = version("arrow", "2.0.0-rc.1")
val kotlinLoggingVersion = version("kotlin-logging", "7.0.3")
val logbackClassicVersion = version("logback-classic", "1.5.12")
val fabric8Version = version("fabric8", "7.0.0")
val kotestVersion = version("kotest", "5.9.1")
val kotlinxCoroutineVersion = version("kotlinx-coroutine", "1.9.0")
val opentelemetryVersion = version("opentelemetry", "1.44.1")
val graphQLVersion = version("graphql", "8.2.1")

val grpcVersion = version("grpc", "1.68.2")
val grpcKotlinVersion = version("grpc-kotlin", "1.4.1")
val protobufVersion = version("protobuf-kotlin", "3.25.2")
val protobufVersion = version("protobuf-kotlin", "4.29.0")

library("hoplite.yaml", "com.sksamuel.hoplite", "hoplite-yaml").versionRef(hopliteVersion)

Expand Down

0 comments on commit 17007ab

Please sign in to comment.