feat: Java 25

Author: Angular2Guy

backend/build.gradle

@@ -13,32 +13,22 @@
  plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.5.0'
-	id 'org.graalvm.buildtools.native' version '0.10.6'
 	id 'io.spring.dependency-management' version '1.1.7'
-	id 'org.hibernate.orm' version '6.6.15.Final'
 }
 
 group = 'ch.xxx'
 version = '0.0.1-SNAPSHOT'
 
 java {
 	toolchain {
-		languageVersion = JavaLanguageVersion.of(24)
+		languageVersion = JavaLanguageVersion.of(25)
 	}
 }
 
 repositories {
 	mavenCentral()
 }
 
-hibernate {
-  enhancement {
-    enableAssociationManagement = true
-    //lazyInitialization = true
-    //dirtyTracking = true    
-  }
-}
-
 dependencies {
 	implementation project(':frontend')
 	implementation 'org.springframework.boot:spring-boot-starter'
@@ -55,7 +45,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testImplementation 'org.springframework.graphql:spring-graphql-test'
-	testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.0'
+	testImplementation 'com.tngtech.archunit:archunit-junit5:1.4.1'
 
 	if(project.hasProperty('withAngular')) {
 		implementation 'org.postgresql:postgresql'
@@ -73,23 +63,18 @@ test {
 	useJUnitPlatform()
 }
 
-graalvmNative {
-    binaries {
-        main {
-          buildArgs.add("--gc=G1")
-        }
-    }
+// Ensure backend tasks wait for frontend
+
+tasks.named('processResources') {
+    dependsOn(':frontend:buildAngular')
+}
+
+tasks.named('classes') {
+    dependsOn(':frontend:buildAngular')
 }
 
-//eclpise fix
-tasks.register('copyClasses') {
-   doLast{
-      copy {
-         from layout.buildDirectory.dir("classes/java")
-         include "**/*.class"
-         into layout.projectDirectory.dir("bin")
-      }
-   }
+tasks.named('bootJar') {
+    dependsOn(':frontend:buildAngular')
 }
 
 task buildDockerImage {
@@ -102,5 +87,3 @@ task buildDockerImage {
 		}
 	}
 }
-
-build.dependsOn copyClasses

frontend/build.gradle

@@ -18,51 +18,82 @@ group = 'ch.xxx'
 version = '0.0.1-SNAPSHOT'
 
 task cleanAngular {
-	if(project.hasProperty('withAngular')) {	
-		println('Task cleanAngular')	
-		delete('src/angular/node_modules')
-	}
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    doLast {
+        println('Task cleanAngular')
+        delete('src/angular/node_modules')
+    }
 }
 
-task buildAngular(type:Exec) {
-	if(project.hasProperty('withAngular')) {				
-		exec{
-			println('Task buildAngular - npm install')	
-			workingDir 'src/angular'			
-			if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
-				commandLine 'npm.cmd', 'install'
-			} else {
-				commandLine 'npm', 'install'
-			}
-		}
-		exec {
-			println('Task buildAngular - npm run build')
-			workingDir 'src/angular'
-			if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
-				commandLine 'npm.cmd', 'run', 'build'
-			} else {
-				commandLine 'npm', 'run', 'build'
-			}		
-		}
-	}
+task cleanDist {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    doLast {
+        delete('src/angular/dist')
+    }
 }
 
-task testAngular(type:Exec) {
-	if(project.hasProperty('withAngular')) {		
-		exec {
-			workingDir 'src/angular'
-			if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
-				println('Task buildAngular - npm run test')		
-				commandLine 'npm.cmd', 'run', 'test'
-			} else {
-				if(project.hasProperty("useChromium")) {
-					println('Task buildAngular - npm run test-chromium')
-					commandLine 'npm', 'run', 'test-chromium'
-				} else {
-					println('Task buildAngular - npm run test')
-					commandLine 'npm', 'run', 'test'
-				}
-			}
-		}
-	}
+task createDist {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    doLast {
+        mkdir('src/angular/dist')
+    }
 }
+
+task npmInstall(type: Exec) {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    workingDir = file('src/angular')
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
+        commandLine 'npm.cmd', 'install'
+    } else {
+        commandLine 'npm', 'install'
+    }
+    dependsOn cleanAngular
+}
+
+task npmBuild(type: Exec) {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    workingDir = file('src/angular')
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
+        commandLine 'npm.cmd', 'run', 'build'
+    } else {
+        commandLine 'npm', 'run', 'build'
+    }
+    dependsOn npmInstall, cleanDist, createDist
+}
+
+task testAngular(type: Exec) {
+    onlyIf {
+        project.hasProperty('withAngular')
+    }
+    workingDir = file('src/angular')
+    if (System.getProperty("os.name").toUpperCase().contains("WINDOWS")){
+        commandLine 'npm.cmd', 'run', 'test'
+    } else {
+        if(project.hasProperty("useChromium")) {
+            commandLine 'npm', 'run', 'test-chromium'
+        } else {
+            commandLine 'npm', 'run', 'test'
+        }
+    }
+    dependsOn npmInstall
+    doFirst {
+        println("Running ${commandLine.join(' ')}")
+    }
+}
+
+task buildAngular {
+    dependsOn npmBuild, testAngular
+}
+
+// Make sure the main build task depends on buildAngular
+build.dependsOn buildAngular

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,2 +1,2 @@
 rootProject.name = 'maps'
-include 'frontend' , 'backend'
+include ('frontend' , 'backend')