Merge pull request #135 from meshcloud/feature/toolchain-update

feature/toolchain update

.github/workflows/build-workflow.yml

@@ -13,13 +13,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build
 

.github/workflows/release-workflow.yml

@@ -60,13 +60,13 @@ jobs:
     needs: create-release
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: temurin
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: build
       - name: Upload Service Broker Release Asset

Dockerfile

@@ -6,15 +6,15 @@
 #   - at least docker 19.03
 #   - docker buildkit enabled (export DOCKER_BUILDKIT=1)
 
-FROM eclipse-temurin:11-jdk-jammy as builder
+FROM eclipse-temurin:17-jdk as builder
 
 COPY ./ /build
 
 WORKDIR /build
 
 RUN ./gradlew :bootJar -x test
 
-FROM eclipse-temurin:11-jre-jammy
+FROM eclipse-temurin:17-jre
 
 COPY --from=builder /build/build/libs/unipipe-service-broker-1.0.0.jar /app/
 

build.gradle.kts

@@ -1,18 +1,14 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
-  id("org.springframework.boot") version "2.4.6"
-  id("io.spring.dependency-management") version "1.0.11.RELEASE"
+  id("org.jetbrains.kotlin.jvm") version "1.7.10"
+  id("org.jetbrains.kotlin.plugin.spring") version "1.7.10"
 
-  kotlin("jvm") version "1.5.0"
-  kotlin("plugin.spring") version "1.5.0"
-
-  id("eclipse")
+  id("org.springframework.boot") version "2.7.16"
+  id("io.spring.dependency-management") version "1.0.11.RELEASE"
 }
 
 group = "io.meshcloud"
 version = "1.0.0"
-java.sourceCompatibility = JavaVersion.VERSION_11
+java.sourceCompatibility = JavaVersion.VERSION_17
 
 repositories {
   mavenCentral()
@@ -22,7 +18,7 @@ dependencies {
   implementation("org.springframework.boot:spring-boot-starter-web")
   implementation("org.springframework.boot:spring-boot-starter-security")
   implementation("org.springframework.boot:spring-boot-starter-hateoas")
-  implementation("org.springframework.cloud:spring-cloud-starter-open-service-broker:3.3.0")
+  implementation("org.springframework.cloud:spring-cloud-starter-open-service-broker:3.6.1")
 
   implementation("com.fasterxml.jackson.module:jackson-module-kotlin")
   implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
@@ -35,21 +31,20 @@ dependencies {
     exclude(group = "com.jcraft", module = "jsch")
   }
 
-  implementation("commons-io:commons-io:2.4")
   implementation("io.github.microutils:kotlin-logging:1.4.9")
   implementation("io.projectreactor.kotlin:reactor-kotlin-extensions:1.0.2.RELEASE")
 
   developmentOnly("org.springframework.boot:spring-boot-devtools")
 
+  testImplementation("commons-io:commons-io:2.16.1")
   testImplementation("org.junit.vintage:junit-vintage-engine")
   testImplementation("org.springframework.boot:spring-boot-starter-test")
   testImplementation("org.springframework.security:spring-security-test")
 }
 
-tasks.withType<KotlinCompile> {
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
   kotlinOptions {
-    freeCompilerArgs = listOf("-Xjsr305=strict")
-    jvmTarget = "11"
+    jvmTarget = "17"
   }
 }
 

flake.nix

@@ -0,0 +1,31 @@
+{
+  description = "Java 17 development environment with optional JetBrains IDEA";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs { inherit system; };
+      in
+      rec {
+        # Default devShell with Java 17
+        devShells.default = pkgs.mkShell {
+          buildInputs = [
+            pkgs.zulu17 # zulu is the only one that provides aarch64-darwin builds
+            pkgs.deno
+          ];
+        };
+
+        # Separate devShell for JetBrains IntelliJ IDEA
+        devShells.idea = pkgs.mkShell {
+          buildInputs = [
+            pkgs.jetbrains.idea-community
+            pkgs.openjdk17
+          ];
+        };
+      });
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists