finally fixed the build for all variants, all variants are running

IOOI-SqAR · Jan 2, 2024 · fc63283 · fc63283
1 parent f4b051f
commit fc63283
Show file tree

Hide file tree

Showing 38 changed files with 1,591 additions and 267 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/JTCEMU/build.gradle.kts b/JTCEMU/build.gradle.kts
@@ -1,7 +1,6 @@
-import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.include
-
 plugins {
     id("java")
+    id("application")
 }
 
 group = "org.sqar.virtualjtc"
@@ -18,6 +17,11 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
 }
 
+application {
+    mainModule = "JTCEMU"
+    mainClass = "org.jens_mueller.jtcemu.platform.se.Main"
+}
+
 tasks.test {
     useJUnitPlatform()
 }
diff --git a/JTCEMU/settings.gradle b/JTCEMU/settings.gradle
diff --git a/JTCEMU/src/main/java/module-info.java b/JTCEMU/src/main/java/module-info.java
@@ -1,9 +1,9 @@
-module org.jens_mueller.jtcemu.platform.se {
+module JTCEMU {
     requires java.logging;
     requires java.naming;
     requires java.desktop;
 
-    requires org.jens_mueller.JTCEMUCommon;
+    requires JTCEMUCommon;
 
     opens org.jens_mueller.jtcemu.platform.se;
     exports org.jens_mueller.jtcemu.platform.se;

diff --git a/JTCEMUCommon/settings.gradle b/JTCEMUCommon/settings.gradle
diff --git a/JTCEMUCommon/src/main/java/module-info.java b/JTCEMUCommon/src/main/java/module-info.java
@@ -1,11 +1,11 @@
-module org.jens_mueller.JTCEMUCommon {
-    exports org.jens_mueller.jtcemu.base to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
-    exports org.jens_mueller.jtcemu.tools to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
-    exports org.jens_mueller.jtcemu.tools.assembler to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
-    exports org.jens_mueller.z8 to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
+module JTCEMUCommon {
+    exports org.jens_mueller.jtcemu.base;
+    exports org.jens_mueller.jtcemu.tools;
+    exports org.jens_mueller.jtcemu.tools.assembler;
+    exports org.jens_mueller.z8;
 
-    opens org.jens_mueller.jtcemu.base to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
-    opens org.jens_mueller.jtcemu.tools to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
-    opens org.jens_mueller.jtcemu.tools.assembler to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
-    opens org.jens_mueller.z8 to org.jens_mueller.jtcemu.platform.se, org.jens_mueller.jtcemu.platform.fx;
+    opens org.jens_mueller.jtcemu.base;
+    opens org.jens_mueller.jtcemu.tools;
+    opens org.jens_mueller.jtcemu.tools.assembler;
+    opens org.jens_mueller.z8;
 }
diff --git a/JTCEMUCommon/src/main/java/org/jens_mueller/jtcemu/base/ExtROM.java b/JTCEMUCommon/src/main/java/org/jens_mueller/jtcemu/base/ExtROM.java
@@ -157,4 +157,4 @@ public String toString()
   {
     return this.text;
   }
-}
+}
diff --git a/JTCemuFX/biuld.gradle.kts.off b/JTCemuFX/biuld.gradle.kts.off
@@ -69,11 +69,6 @@ dependencies {
 tasks.withType<Jar> {
   manifest {
     attributes["Main-Class"] = "org.jens_mueller.jtcemu.platform.fx.Launcher"
-//    attributes["Class-Path"] = configurations
-//            .runtimeClasspath
-//            .get()
-//            .joinToString(separator = " ") {  if (it.isDirectory) { it.toString() } else { zipTree(it).toString() } }
-            // .duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
   }
 }
 

diff --git a/JTCemuFX/build.gradle b/JTCemuFX/build.gradle
@@ -6,7 +6,7 @@ plugins {
   id 'org.beryx.jlink' version '2.25.0'
 }
 
-group 'com.example'
+group 'org.sqar.virtualjtc'
 version '1.0-SNAPSHOT'
 
 repositories {
@@ -18,30 +18,22 @@ ext {
   junitVersion = '5.10.0'
 }
 
-sourceCompatibility = '21'
-targetCompatibility = '21'
-
 tasks.withType(JavaCompile).configureEach {
   options.encoding = 'UTF-8'
 }
 
 application {
-  mainModule = 'com.example.jtcemufx'
-  mainClass = 'com.example.jtcemufx.HelloApplication'
+  mainModule = "JTCemuFX"
+  mainClass = "org.jens_mueller.jtcemu.platform.fx.Launcher"
 }
 
-
 javafx {
   version = "$javafx_version"
-  application {
-    mainClassName = "org.jens_mueller.jtcemu.platform.fx.Launcher"
-    applicationName = 'JTCemuFX'
-    modules = [ 'javafx.base','javafx.fxml','javafx.controls','javafx.graphics','javafx.web','javafx.media','javafx.swing' ]
-  }
+  modules = [ 'javafx.base','javafx.fxml','javafx.controls','javafx.graphics','javafx.web','javafx.media','javafx.swing' ]
 }
 
 dependencies {
-  implementation(project(":JTCEMUCommon"))
+  implementation project(":JTCEMUCommon")
 
   // here starts JavaFX
   compileOnly "org.openjfx:javafx:$javafx_version"
@@ -63,10 +55,6 @@ jar {
             'Main-Class': 'org.jens_mueller.jtcemu.platform.fx.Launcher' // replace with you main class
     )
   }
-  from {
-    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-  }
-  duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
 }
 
 dependencies {

diff --git a/JTCemuFX/gradle/wrapper/gradle-wrapper.properties b/JTCemuFX/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/JTCemuFX/settings.gradle b/JTCemuFX/settings.gradle
diff --git a/JTCemuFX/src/main/java/module-info.java b/JTCemuFX/src/main/java/module-info.java
@@ -1,4 +1,8 @@
-module org.jens_mueller.jtcemu.platform.fx {
+module JTCemuFX {
+    requires javafx.web;
+
+    requires JTCEMUCommon;
+
     opens org.jens_mueller.jtcemu.platform.fx;
     exports org.jens_mueller.jtcemu.platform.fx;
 }
diff --git a/JTCemuFX/src/main/java/org/jens_mueller/jtcemu/platform/fx/JTCEMUApplication.java b/JTCemuFX/src/main/java/org/jens_mueller/jtcemu/platform/fx/JTCEMUApplication.java
@@ -27,6 +27,7 @@
 import org.jens_mueller.jtcemu.base.ErrorViewer;
 import org.jens_mueller.jtcemu.base.JTCSys;
 import org.jens_mueller.jtcemu.base.JTCUtil;
+import org.jens_mueller.jtcemu.platform.fx.base.*;
 import org.jens_mueller.jtcemu.platform.fx.settings.SettingsNode;
 import org.jens_mueller.jtcemu.platform.fx.tools.ReassNode;
 import org.jens_mueller.z8.Z8;
@@ -251,7 +252,7 @@ public Tab showTab(
 	tab = new Tab( text );
 	tab.setClosable( closable );
 	tab.setContent( content );
-	if( content instanceof AppTab ) {
+	if( content instanceof AppTab) {
 	  ((AppTab) content).setTab( tab );
 	  tab.setOnCloseRequest(
 			e->((AppTab) content).tabCloseRequest( e ) );

diff --git a/VirtualJTCCommon/build.gradle.kts b/VirtualJTCCommon/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
     id("java")
+    id("application")
 }
 
-//name = "VirtualJTCCommon"
 group = "org.sqar.virtualjtc"
 version = "1.0-SNAPSHOT"
 
@@ -15,6 +15,11 @@ dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter")
 }
 
+application {
+    mainModule = "VirtualJTCCommon"
+    mainClass = "org.sqar.virtualjtc.jtcemu.Main"
+}
+
 tasks.test {
     useJUnitPlatform()
 }
diff --git a/VirtualJTCCommon/gradle/wrapper/gradle-wrapper.jar b/VirtualJTCCommon/gradle/wrapper/gradle-wrapper.jar
diff --git a/VirtualJTCCommon/gradle/wrapper/gradle-wrapper.properties b/VirtualJTCCommon/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
-Original file line number
+Diff line change
@@ Expand Up / @@ -157,4 +157,4 @@ public String toString() @@
       {
         return this.text;
       }
-    }
+    }