Migrate to JDK 21 and OpenJFX 21

build.gradle

@@ -1,136 +1,69 @@
 plugins {
-	id "com.jfrog.bintray" version "1.8.3"
-	id "com.diffplug.gradle.spotless" version "3.1.0"
-	id "de.undercouch.download" version "3.4.3"
+	id 'java-library'
+	id 'application'
+	id 'maven-publish'
+	id 'org.openjfx.javafxplugin' version '0.1.0'
 }
 
-apply plugin: 'java'
-apply plugin: 'eclipse'
-apply plugin: 'idea'
-apply plugin: 'maven'
-apply plugin: 'maven-publish'
+group = 'org.dockfx'
+version = '0.2.0'
 
+java {
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 
-project.ext.masterfile = (new File(projectDir,'/gradle/master.gradle')).getAbsolutePath()
-
-// Attempts to download master gradle file
-if(!hasProperty('do_not_update_master_file'))
-try {
-	download {
-		src 'https://github.com/ClearControl/master/blob/master/master.gradle?raw=true'
-		dest project.ext.masterfile
-		overwrite true
-		onlyIfModified true
-		tempAndMove true
-	}
-}
-catch (Throwable e)
-{
+	withSourcesJar()
+	withJavadocJar()
 }
 
-apply from: project.ext.masterfile
-
-//***********************************************************************************
-// JAVA CODE BUILDING
+javafx {
+	version = '21.0.2'
+	modules = ['javafx.controls', 'javafx.fxml', 'javafx.graphics', 'javafx.base', 'javafx.web']
+}
 
-sourceSets
-{
-	main
-	{
-		java
-		{ srcDir 'src/main/java' }
-		resources
-		{ srcDir 'src/main/resources' }
+sourceSets {
+	main {
+		java { srcDir 'src/main/java' }
+		resources { srcDir 'src/main/resources' }
 	}
-	test
-	{
-		java
-		{ srcDir 'src/test/java' }
-		resources
-		{ srcDir 'src/test/resources' }
+	test {
+		java { srcDir 'src/test/java' }
+		resources { srcDir 'src/test/resources' }
 	}
 }
 
+tasks.withType(AbstractCopyTask).configureEach {
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-
-test
-{
+test {
 	testLogging.showStandardStreams = true
-	testLogging
-	{ events "passed", "skipped", "failed" }
+	testLogging { events "passed", "skipped", "failed" }
 
 	exclude '**/demo/**'
 	exclude '**/run/**'
 
 	maxHeapSize = "4G"
 }
 
-dependencies
-{
-
-
-}
-
-repositories
-{
-	// Main repos:
+repositories {
 	mavenLocal()
 	mavenCentral()
-	jcenter()
 }
 
-
-task sourcesJar(type: Jar, dependsOn:classes) {
-	classifier = 'sources'
-	from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn:javadoc) {
-	classifier = 'javadoc'
-	from javadoc.destinationDir
-}
-
-if (JavaVersion.current().isJava8Compatible()) {
-	allprojects {
-		tasks.withType(Javadoc) {
-			options.addStringOption('Xdoclint:none', '-quiet')
-		}
-	}
+tasks.withType(Javadoc).configureEach {
+	options.addStringOption('Xdoclint:none', '-quiet')
 }
 
-
-//***********************************************************************************
-// PUBLISHING
-
-group   = project.ext.groupname
-version = project.ext.versionsMap[project.name]
-
-artifacts
-		{
-			archives sourcesJar
-			archives javadocJar
-		}
-
 publishing {
 	publications {
 		maven(MavenPublication) {
 			from components.java
-			artifact sourcesJar { classifier "sources" }
 		}
 	}
 }
 
-
-
-
-
-
-
-
-
-
-
-
+application {
+	mainClass = 'org.dockfx.demo.DockFX'
+	mainModule = 'org.dockfx'
+}

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.daemon=true
-org.gradle.jvmargs=-Xmx4G -Xss256m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4G -Xss256m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 bintray_userorg = clearcontrol
 bintray_repo = ClearControl

gradle/master.gradle

@@ -2,64 +2,66 @@
 // Current release versions for Clear* projects:
 
 ext {
-  groupname = "net.clearcontrol"
-  versionsMap = [:]
-
-  // the dependency graph is layed out in 'levels' that represent their dependency depth: 
-  // direct dependency is given, dependencies are transitive.
-  // Dependencies in the same level do not depend on each other.
-  // When editiong this file, be carefull that GitHub does not always instantly reflect the changes.
-
-  // Level 0 (don't depend on any other lib): 
-  versionsMap['coremem']                 = "0.4.6"
-  versionsMap['dockfx']                  = "0.1.12"
-  versionsMap['cleargl']                 = "2.2.1"  // Ulrik Guenter (skalarproduktraum) is currently maintaing this project and releases versions
-  versionsMap['clearaudio']              = "1.0.2"
-
-  // devices adapters:
-  versionsMap['aptj']                    = "0.2.3"  
-  versionsMap['asdkj']                   = "1.0.2"
-  versionsMap['mirao52j']                = "1.0.1"
-  versionsMap['dmp40j']                  = "0.1.0"
-  versionsMap['nirioj']                  = "1.0.2"
-  versionsMap['andorsdkj']               = "0.1.0"
-  versionsMap['ecc100j']                 = "1.0.1"
-
-  // Level 1:
-  versionsMap['halcyon']                 = "0.3.7"  // depends directly on dockfx
-
-  // device adapters:
-  versionsMap['dcamj']                   = "2.1.7"  // depends directly on coremem
-  versionsMap['clearcl']                 = "0.6.2"  // depends directly on coremem
-
-  // Level 2:
-  versionsMap['clearvolume']             = "1.4.2"  // depends directly on clearcl, clearaudio, cleargl
-  versionsMap['simbryo']                 = "0.9.1"  // depends directly on clearcl
-
-  // Level 3:
-  versionsMap['fastfuse']                = "0.6.5"  // depends directly on symbryo
-
-  // Level 4
-  versionsMap['clearclij']               = "0.3.10"  // depends directly FastFuse and indirectly to ClearCL        
-
-  // Level 5:
-  versionsMap['clearcontrol']            = "0.16.8" // depends directly on halcyon, clearvolume, fastfuse, and _all_ devices adapters
-
-  // Level 6:
-  versionsMap['clearcontrol-lightsheet'] = "1.27.9" // depends directly on clearcontrol, only
-
-
-  // Loads locale file: ~/.gradle/local.gradle
-  // You can override versions locally for example:
-  // 
-  //  ext/versionsMap['symbrio']         = "1.0.1-LR"
-  // 
-
-  localfilename = project.gradle.gradleUserHomeDir.getAbsolutePath()+'/local.gradle'
-  if(file(localfilename).exists()){
-    apply from: localfilename
-  }
-
+    groupname = "net.clearcontrol"
+    versionsMap = [:]
+
+    // the dependency graph is layed out in 'levels' that represent their dependency depth:
+    // direct dependency is given, dependencies are transitive.
+    // Dependencies in the same level do not depend on each other.
+    // When editiong this file, be carefull that GitHub does not always instantly reflect the changes.
+
+    // Level 0 (don't depend on any other lib):
+    versionsMap['coremem']                 = "0.4.8"
+    versionsMap['dockfx']                  = "0.1.12"
+    versionsMap['cleargl']                 = "2.2.1"  // Ulrik Guenter (skalarproduktraum) is currently maintaing this project and releases versions
+    versionsMap['clearaudio']              = "1.0.2"
+
+    // devices adapters:
+    versionsMap['aptj']                    = "0.0.5"
+    versionsMap['asdkj']                   = "1.0.2"
+    versionsMap['mirao52j']                = "1.0.1"
+    versionsMap['dmp40j']                  = "0.1.0"
+    versionsMap['nirioj']                  = "1.1.0"  // breaking version change from 1.0.2 to 1.1.0
+    versionsMap['andorsdkj']               = "0.1.0"
+    versionsMap['ecc100j']                 = "1.0.1"
+
+    // Level 1:
+    versionsMap['halcyon']                 = "0.3.7"  // depends directly on dockfx
+
+    // device adapters:
+    versionsMap['dcamj']                   = "2.1.7"  // depends directly on coremem
+    versionsMap['clearcl']                 = "0.6.3"  // depends directly on coremem
+
+    // Level 2:
+    versionsMap['clearvolume']             = "1.4.2"  // depends directly on clearcl, clearaudio, cleargl
+    versionsMap['simbryo']                 = "0.9.1"  // depends directly on clearcl
+
+    // Level 3:
+    versionsMap['fastfuse']                = "0.6.5"  // depends directly on symbryo
+
+    // Level 4
+    versionsMap['clearclij']               = "0.3.18"  // depends directly FastFuse and indirectly to ClearCL
+
+    // Level 5:
+    versionsMap['clearcontrol']            = "0.17.0" // depends directly on halcyon, clearvolume, fastfuse, and _all_ devices adapters
+                                                       // breaking version change from 0.16.14 to 0.17.0
+
+    // Level 6:
+    versionsMap['clearcontrol-lightsheet'] = "1.30.0" // depends on clearcontrol only; breaking version change from 1.29.0 to 1.30.0
+
+    // Level 7:
+    versionsMap['clearcontrol-lightsheet-csbd'] = "0.0.1" // depends directly on clearcontrol-lightsheet
+
+    // Loads locale file: ~/.gradle/local.gradle
+    // You can override versions locally for example:
+    //
+    //  ext/versionsMap['symbrio']         = "1.0.1-LR"
+    //
+
+    localfilename = project.gradle.gradleUserHomeDir.getAbsolutePath()+'/local.gradle'
+    if(file(localfilename).exists()){
+        apply from: localfilename
+    }
 }
 
 ext.depver = { name -> project.ext.versionsMap[name] }
@@ -71,27 +73,27 @@ project.ext.spotlessfile = (new File(projectDir,'/gradle/spotless.gradle')).getA
 // Download files:
 try {
     download {
-    src 'https://github.com/ClearControl/master/blob/master/installGitHooks?raw=true'
-    dest project.ext.githooksfile
-    overwrite false
-    onlyIfModified true
-    tempAndMove true
+        src 'https://github.com/ClearControl/master/blob/master/installGitHooks?raw=true'
+        dest project.ext.githooksfile
+        overwrite false
+        onlyIfModified true
+        tempAndMove true
     }
-    
+
     download {
-    src 'https://github.com/ClearControl/master/blob/master/bintrayUpload.gradle?raw=true'
-    dest project.ext.bintrayfile
-    overwrite false
-    onlyIfModified true
-    tempAndMove true
+        src 'https://github.com/ClearControl/master/blob/master/bintrayUpload.gradle?raw=true'
+        dest project.ext.bintrayfile
+        overwrite false
+        onlyIfModified true
+        tempAndMove true
     }
-    
+
     download {
-    src 'https://github.com/ClearControl/master/blob/master/spotless.gradle?raw=true'
-    dest project.ext.spotlessfile
-    overwrite false
-    onlyIfModified true
-    tempAndMove true
+        src 'https://github.com/ClearControl/master/blob/master/spotless.gradle?raw=true'
+        dest project.ext.spotlessfile
+        overwrite false
+        onlyIfModified true
+        tempAndMove true
     }
 }
 catch (Throwable e)
@@ -111,4 +113,4 @@ apply from: project.ext.spotlessfile
 
 
 
-  
+

gradle/wrapper/gradle-wrapper.properties

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