fix: fixed broken runtime since v1.1.0

ennioVisco · Feb 15, 2024 · 85a2243 · 85a2243
1 parent 3d26491
commit 85a2243
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -18,7 +18,7 @@ jobs:
           java-version: 21
           distribution: adopt
       - name: Build documentation
-        run: ./gradlew dokkaHtml
+        run: ./gradlew dokkaHtml --no-configuration-cache
       - name: Add sample test page
         run: mv sample.html build/dokka/sample.html
       - name: Publish documentation

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -157,10 +157,18 @@ fun runtimeArgs(exec: Any) {
         listOf(
             GARBAGE_COLLECTOR,
 //        ENABLE_PREVIEW,
-//        "--add-exports", "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
-//        "--add-exports", "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED",
-//        "--add-opens", "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
-//        "--add-opens", "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED"
+            "--add-exports",
+            "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
+            "--add-exports",
+            "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED",
+            "--add-exports",
+            "javafx.graphics/com.sun.javafx.util=ALL-UNNAMED",
+            "--add-exports",
+            "javafx.base/com.sun.javafx.logging=ALL-UNNAMED",
+            "--add-opens",
+            "javafx.graphics/com.sun.glass.ui=ALL-UNNAMED",
+            "--add-opens",
+            "javafx.graphics/com.sun.glass.utils=ALL-UNNAMED"
         )
     when (exec) {
         is JavaExec -> exec.jvmArgs(arguments)
@@ -221,7 +229,7 @@ application {
     applicationDefaultJvmArgs = listOf(ENABLE_PREVIEW)
 //    println("Current exec dir: $executableDir")
     mainClass.set(pkg("Main"))
-    mainModule.set("org.enniovisco.webmonitor")
+//    mainModule.set("com.enniovisco.webmonitor") // TODO: investigate, this seems to brake javafx deps
 }
 
 val jarsDir: Provider<Directory> = layout.buildDirectory.dir("jars")

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
 # Kotlin config
 kotlin.code.style=official
-kotlin.experimental.tryK2=true
+#kotlin.experimental.tryK2=true
 # Gradle config
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+#org.gradle.configuration-cache=true
 org.gradle.warning-mode=all
 # Project info
 project.name=webmonitor

diff --git a/src/main/kotlin/module-info.java b/src/main/kotlin/module-info.java
@@ -1,8 +1,9 @@
-module webmonitor {
+module com.enniovisco.webmonitor {
     // JavaFX
     requires javafx.base;
     requires javafx.controls;
     requires javafx.swing;
+    requires javafx.graphics;
     requires javafx.web;
 
     requires org.seleniumhq.selenium.api;
@@ -16,6 +17,13 @@
     requires java.scripting;
 
     exports com.enniovisco;
+    exports com.enniovisco.checking;
+    exports com.enniovisco.cli;
+    exports com.enniovisco.dsl;
+    exports com.enniovisco.reporting;
+    exports com.enniovisco.space;
+    exports com.enniovisco.tracking;
+    exports com.enniovisco.tracking.commands;
 
     opens com.enniovisco to javafx.graphics;
 }