deps: update java to 21 and to gradle 8.5 (#38)

Aam-Digital · Oct 7, 2024 · 5bcb2ac · 5bcb2ac
1 parent 90eeabb
commit 5bcb2ac
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 33 deletions.
diff --git a/application/aam-backend-service/Dockerfile b/application/aam-backend-service/Dockerfile
@@ -1,5 +1,10 @@
-FROM amazoncorretto:17-alpine
-COPY ./build/install/aam-backend-service /aam-backend-service
-WORKDIR /aam-backend-service/bin
+FROM gradle:8.10.2-jdk21-alpine AS BUILD
+WORKDIR /opt/app
+COPY . .
+RUN gradle installDist
+
+FROM amazoncorretto:21-alpine
+WORKDIR /opt/app
+COPY --from=BUILD /opt/app/build/install/aam-backend-service /opt/app
 EXPOSE 8080
-CMD ./aam-backend-service
+CMD ./bin/aam-backend-service
diff --git a/application/aam-backend-service/build.gradle.kts b/application/aam-backend-service/build.gradle.kts
@@ -1,26 +1,22 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins {
     application
     distribution
     jacoco
-    id("org.springframework.boot") version "3.2.3"
-    id("io.spring.dependency-management") version "1.1.4"
-    id("io.sentry.jvm.gradle") version "4.3.1"
-    kotlin("kapt") version "1.9.22"
-    kotlin("jvm") version "1.9.22"
+    id("org.springframework.boot") version "3.3.4"
+    id("io.spring.dependency-management") version "1.1.6"
+    id("io.sentry.jvm.gradle") version "4.11.0"
+    id("org.jetbrains.kotlin.kapt") version "1.9.25"
+    kotlin("jvm") version "1.9.25"
     kotlin("plugin.spring") version "1.9.22"
 }
 
 group = "com.aam-digital"
 version = "0.0.1-SNAPSHOT"
 
-application {
-    mainClass.set("com.aamdigital.aambackendservice.ApplicationKt")
-}
-
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
 }
 
 configurations {
@@ -29,6 +25,10 @@ configurations {
     }
 }
 
+application {
+    mainClass.set("com.aamdigital.aambackendservice.ApplicationKt")
+}
+
 repositories {
     mavenCentral()
 }
@@ -116,10 +116,9 @@ sentry {
     version = System.getenv("APPLICATION_VERSION")
 }
 
-tasks.withType<KotlinCompile> {
-    kotlinOptions {
-        freeCompilerArgs += "-Xjsr305=strict"
-        jvmTarget = "17"
+kotlin {
+    compilerOptions {
+        freeCompilerArgs.addAll("-Xjsr305=strict")
     }
 }
 

diff --git a/application/aam-backend-service/gradle/wrapper/gradle-wrapper.jar b/application/aam-backend-service/gradle/wrapper/gradle-wrapper.jar
diff --git a/application/aam-backend-service/gradle/wrapper/gradle-wrapper.properties b/application/aam-backend-service/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/application/aam-backend-service/gradlew b/application/aam-backend-service/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/application/aam-backend-service/gradlew.bat b/application/aam-backend-service/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail