ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Uplift to Java 21

Browse source
This commit is contained in:
Ziver Koc 2025-12-16 23:55:17 +01:00
parent e39e1b462d
commit c7f0d4e8b3
3 changed files with 55 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
build.gradle
View file

@ -3,6 +3,30 @@ plugins {
id 'application' id 'application'
} }
/*
* The MIT License (MIT)
*
* Copyright (c) 2025 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
// ------------------------------------ // ------------------------------------
// Hal common configuration // Hal common configuration
// ------------------------------------ // ------------------------------------
@ -62,7 +86,7 @@ distributions {
from 'hal.conf.example' from 'hal.conf.example'
from 'logging.properties' from 'logging.properties'
from "${buildDir}/resources" from sourceSets.main.output.resourcesDir
} }
} }
} }
@ -76,11 +100,12 @@ task copyRecources(type: Copy) {
from "${subProject.projectDir}/resources" from "${subProject.projectDir}/resources"
} }
into("${buildDir}/resources") into(sourceSets.main.output.resourcesDir)
} }
processResources.finalizedBy(copyRecources) jar.dependsOn(copyRecources)
copyRecources.mustRunAfter(processResources)
application { application {
mainClass = 'se.hal.HalServer' mainClass = 'se.hal.HalServer'
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

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

26
hal-core/src/se/hal/intf/HalAbstractControllerManager.java
View file

@ -1,3 +1,27 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2025 Ziver Koc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package se.hal.intf; package se.hal.intf;
import zutil.ClassUtil; import zutil.ClassUtil;
@ -43,7 +67,7 @@ public abstract class HalAbstractControllerManager<T extends HalAbstractControll
// Instantiate autostart controllers, but only the first time // Instantiate autostart controllers, but only the first time
synchronized (autostartProcessed) { synchronized (this) {
if (!autostartProcessed) { if (!autostartProcessed) {
for (Iterator<Class<? extends HalAutostartController>> it = pluginManager.getClassIterator(HalAutostartController.class); it.hasNext(); ) { for (Iterator<Class<? extends HalAutostartController>> it = pluginManager.getClassIterator(HalAutostartController.class); it.hasNext(); ) {
Class controller = it.next(); Class controller = it.next();