From d2797b7c872a0aca2318bbbfa8df055d06657c50 Mon Sep 17 00:00:00 2001 From: Iuliia Sobolevska Date: Mon, 18 Nov 2024 12:12:08 -0800 Subject: [PATCH] update infra to use JDK 17 --- .github/workflows/nebula-publish.yml | 2 +- .github/workflows/nebula-snapshot.yml | 2 +- .github/workflows/update-gradle-wrapper.yml | 2 +- .sdkmanrc | 2 +- CONTRIBUTING.md | 15 ++++++++------- graphql-dgs-codegen-core/Dockerfile | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/nebula-publish.yml b/.github/workflows/nebula-publish.yml index 090dc38be..3183bc7f9 100644 --- a/.github/workflows/nebula-publish.yml +++ b/.github/workflows/nebula-publish.yml @@ -17,7 +17,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 8 + java-version: 17 - uses: actions/cache@v4.1.1 id: gradle-cache with: diff --git a/.github/workflows/nebula-snapshot.yml b/.github/workflows/nebula-snapshot.yml index 6b902c8fb..24fa1aad5 100644 --- a/.github/workflows/nebula-snapshot.yml +++ b/.github/workflows/nebula-snapshot.yml @@ -17,7 +17,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v4 with: - java-version: 8 + java-version: 17 distribution: zulu - uses: actions/cache@v4.1.1 id: gradle-cache diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml index b9155f21c..a72cc3e8f 100644 --- a/.github/workflows/update-gradle-wrapper.yml +++ b/.github/workflows/update-gradle-wrapper.yml @@ -15,6 +15,6 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'zulu' - java-version: 8 + java-version: 17 - name: Update Gradle Wrapper uses: gradle-update/update-gradle-wrapper-action@v2 diff --git a/.sdkmanrc b/.sdkmanrc index 41ab80767..10d6c7aff 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,3 +1,3 @@ # Enable auto-env through the sdkman_auto_env config # Add key=value pairs of SDKs to use below -java=8.0.312-zulu +java=17.0.11-zulu diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 25526f0eb..4de3f4cf0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -82,17 +82,18 @@ Working on the code base IDE setup ----- -The DGS codebases are Kotlin based. We strongly recommend using Intellij because of the excellent support for Kotlin and -Gradle. You can use the free [Intellij Community Edition](https://www.jetbrains.com/idea/download/). +The DGS codebases are Kotlin based. +We strongly recommend using IntelliJ because of the excellent support for Kotlin and Gradle. +You can use the free [IntelliJ Community Edition](https://www.jetbrains.com/idea/download/). -Clone and open the project using the "project from version control feature" and let Gradle import all dependencies. Note -that we build on Java 8, so a Java 8 JDK is required. If you don't have a JDK, you can use [sdkman](https://sdkman.io/) -or [Intellij](https://www.jetbrains.com/help/idea/sdk.html) to install one. Because almost all the code is Kotlin, we -don't miss any language features of newer Java releases while supporting a broad range of older releases. +Clone and open the project using the "project from version control feature" and let Gradle import all dependencies. +Note that we build on Java 17, so a Java 17 JDK is required. +If you don't have a JDK, you can use [sdkman](https://sdkman.io/) or [IntelliJ](https://www.jetbrains.com/help/idea/sdk.html) to install one. +Because almost all the code is Kotlin, we don't miss any language features of newer Java releases while supporting a broad range of older releases. Code conventions ----- -We use the standard Kotlin coding conventions. Intellij should select the correct style automatically because we checked +We use the standard Kotlin coding conventions. IntelliJ should select the correct style automatically because we checked in the `.idea/codeStyle` folder. Furthermore, we're also using [Ktlint](https://ktlint.github.io/). You can run formatting manually using Gradle: diff --git a/graphql-dgs-codegen-core/Dockerfile b/graphql-dgs-codegen-core/Dockerfile index d72d09806..050d2d494 100644 --- a/graphql-dgs-codegen-core/Dockerfile +++ b/graphql-dgs-codegen-core/Dockerfile @@ -1,4 +1,4 @@ -FROM dockerregistry.test.netflix.net:7002/platform/java/8:latest +FROM dockerregistry.test.netflix.net:7002/platform/java/17:latest COPY build/distributions/*.tar /app/