Skip to content

Commit

Permalink
another attempt to fix the build
Browse files Browse the repository at this point in the history
  • Loading branch information
IOOI-SqAR committed Jan 1, 2024
1 parent a81b287 commit 527d064
Show file tree
Hide file tree
Showing 386 changed files with 96 additions and 46,089 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions JTCEMU/JTCEMU.iml

This file was deleted.

4 changes: 4 additions & 0 deletions JTCEMU/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.gradle.internal.impldep.org.junit.experimental.categories.Categories.CategoryFilter.include

plugins {
id("java")
}
Expand All @@ -10,6 +12,8 @@ repositories {
}

dependencies {
implementation(project(":JTCEMUCommon"))

testImplementation(platform("org.junit:junit-bom:5.9.1"))
testImplementation("org.junit.jupiter:junit-jupiter")
}
Expand Down
File renamed without changes.
6 changes: 5 additions & 1 deletion JTCEMU/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
module org.jens_mueller.jtcemu.platform.se {
requires org.jens_mueller;
requires java.logging;
requires java.naming;
requires java.desktop;

requires org.jens_mueller.JTCEMUCommon;

opens org.jens_mueller.jtcemu.platform.se;
exports org.jens_mueller.jtcemu.platform.se;
Expand Down
11 changes: 0 additions & 11 deletions JTCEMUCommon/JTCEMUCommon.iml

This file was deleted.

1 change: 1 addition & 0 deletions JTCEMUCommon/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
plugins {
id("java")
id("java-library")
}

group = "org.sqar.virtualjtc"
Expand Down
16 changes: 10 additions & 6 deletions JTCEMUCommon/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
module org.jens_mueller.JTCEMUCommons {
requires gradle.kotlin.dsl;
exports org.jens_mueller.jtcemu.base;
exports org.jens_mueller.jtcemu.tools;
exports org.jens_mueller.jtcemu.tools.assembler;
exports org.jens_mueller.z8;
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;

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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@

package org.jens_mueller.z8;


import org.sqar.virtualjtc.z8.Z8;

public interface Z8Debugger
{
public void z8DebugStatusChanged( Z8 z8 );
Expand Down
44 changes: 40 additions & 4 deletions JTCemuFX/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ plugins {
id 'java'
id 'application'
id 'org.javamodularity.moduleplugin' version '1.8.12'
id 'org.openjfx.javafxplugin' version '0.0.13'
id 'org.openjfx.javafxplugin' version '0.1.0'
id 'org.beryx.jlink' version '2.25.0'
}

Expand All @@ -29,19 +29,55 @@ application {
mainClass = 'com.example.jtcemufx.HelloApplication'
}


javafx {
version = '21'
modules = ['javafx.controls', 'javafx.fxml']
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' ]
}
}

dependencies {
implementation(project(":JTCEMUCommon"))

// here starts JavaFX
compileOnly "org.openjfx:javafx:$javafx_version"

compileOnly "org.openjfx:javafx-base:$javafx_version"
compileOnly "org.openjfx:javafx-graphics:$javafx_version"
compileOnly "org.openjfx:javafx-controls:$javafx_version"
compileOnly "org.openjfx:javafx-fxml:$javafx_version"
compileOnly "org.openjfx:javafx-swing:$javafx_version"
compileOnly "org.openjfx:javafx-media:$javafx_version"
compileOnly "org.openjfx:javafx-web:$javafx_version"

testImplementation 'junit:junit:4.13.1'
}

jar {
manifest {
attributes(
'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 {
implementation project(":JTCEMUCommon")

testImplementation("org.junit.jupiter:junit-jupiter-api:${junitVersion}")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}")
}

test {
useJUnitPlatform()}
useJUnitPlatform()
}

jlink {
imageZip = project.file("${buildDir}/distributions/app-${javafx.platform.classifier}.zip")
Expand Down
File renamed without changes.
2 changes: 0 additions & 2 deletions JTCemuFX/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
requires javafx.controls;
requires javafx.fxml;

requires org.jens_mueller.JTCEMUCommons;

opens org.jens_mueller.jtcemu.platform.fx to javafx.fxml;
exports org.jens_mueller.jtcemu.platform.fx;
}
20 changes: 20 additions & 0 deletions VirtualJTCCommon/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
plugins {
id("java")
}

//name = "VirtualJTCCommon"
group = "org.sqar.virtualjtc"
version = "1.0-SNAPSHOT"

repositories {
mavenCentral()
}

dependencies {
testImplementation(platform("org.junit:junit-bom:5.9.1"))
testImplementation("org.junit.jupiter:junit-jupiter")
}

tasks.test {
useJUnitPlatform()
}
File renamed without changes.
8 changes: 8 additions & 0 deletions VirtualJTCCommon/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module jtcemu {
requires java.logging;
requires java.naming;
requires java.desktop;

exports org.sqar.virtualjtc.jtcemu;
opens org.sqar.virtualjtc.jtcemu;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
48 changes: 3 additions & 45 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,61 +5,19 @@ buildscript {
plugins {
id 'java'
id 'application'
id 'org.openjfx.javafxplugin' version '0.1.0'
}

group 'org.sqar.virtualjtc'
version '1.0-SNAPSHOT'

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
languageVersion = JavaLanguageVersion.of(21)
}
sourceCompatibility = '17'
targetCompatibility = '17'
sourceCompatibility = '21'
targetCompatibility = '21'
}

//application {
// mainModule = 'org.jens_mueller.jtcemu'
// mainClassName = 'org.jens_mueller.jtcemu.platform.fx.Launcher'
//}

repositories {
mavenCentral()
}

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' ]
}
}

dependencies {
// here starts JavaFX
compileOnly "org.openjfx:javafx:$javafx_version"

compileOnly "org.openjfx:javafx-base:$javafx_version"
compileOnly "org.openjfx:javafx-graphics:$javafx_version"
compileOnly "org.openjfx:javafx-controls:$javafx_version"
compileOnly "org.openjfx:javafx-fxml:$javafx_version"
compileOnly "org.openjfx:javafx-swing:$javafx_version"
compileOnly "org.openjfx:javafx-media:$javafx_version"
compileOnly "org.openjfx:javafx-web:$javafx_version"

testImplementation 'junit:junit:4.13.1'
}

jar {
manifest {
attributes(
'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)
}
6 changes: 4 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
rootProject.name = 'VirtualJTC'
include 'JTCEMU'
include 'JTCEMUCommon'
include ':JTCEMUCommon'
include ':JTCEMU'
include ':JTCemuFX'
include ':VirtualJTCCommon'

8 changes: 0 additions & 8 deletions src/main/java/module-info.java

This file was deleted.

Loading

0 comments on commit 527d064

Please sign in to comment.