From 331cb429949816da03ba41051d25522553d6cde6 Mon Sep 17 00:00:00 2001
From: Marcus Lagergren <1062473+lagergren@users.noreply.github.com>
Date: Wed, 17 Jan 2024 12:41:39 +0100
Subject: [PATCH] Rebuilt with latest plugin

---
 build.gradle.kts          | 18 +++++++-----------
 gradle/libs.versions.toml |  2 +-
 platformUI/gui/.gitignore |  3 +++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index a60e271..8375152 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -60,7 +60,7 @@ dependencies {
  * execution command line, of course, if you do it manually).
  */
 
-internal val passwordProvider = provider {
+internal val passwordProvider: Provider<String> = provider {
     logger.lifecycle("Resolving password for XTC platform...")
     val key = "org.xtclang.${project.name}.passwordz"
     val password = findProperty(key)?.toString() ?: System.getProperty(key) ?: ""
@@ -79,14 +79,11 @@ internal val passwordProvider = provider {
 val commonXtcOutputDir = layout.buildDirectory.dir("platform")
 allprojects {
     tasks.withType<XtcCompileTask>().configureEach {
-        additionalOutputDir = commonXtcOutputDir
-    }
-}
-
-val installXtcLangGitHubRepoConfig by tasks.registering {
-    doLast {
-        exec {
-            executable = "curl"
+        doLast {
+            copy {
+                from(outputs.files.asFileTree)
+                into(commonXtcOutputDir)
+            }
         }
     }
 }
@@ -103,12 +100,11 @@ val installXtcLangGitHubRepoConfig by tasks.registering {
 xtcRun {
     verbose = true
     //fork = false
-    logOutputs = false // Dump output to default consoles.
     stdin = System.`in` // Prevent Gradle from eating stdin; make it interactive with the Gradle process that executes the kernel.
     module {
         moduleName = "kernel"
         // Comment the next line out, if you want to grab output from stdin.
-        moduleArgs(passwordProvider)
+        moduleArg(passwordProvider)
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fab7be2..8a000cf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -11,7 +11,7 @@
 #
 
 [versions]
-xdk = "0.4.4441"
+xdk = "0.4.5"
 
 gradle-node = "7.0.1"
 node = "20.10.0"
diff --git a/platformUI/gui/.gitignore b/platformUI/gui/.gitignore
index f1d913c..d74f879 100644
--- a/platformUI/gui/.gitignore
+++ b/platformUI/gui/.gitignore
@@ -31,3 +31,6 @@ yarn-error.log*
 
 # local .env files
 .env.local*
+
+# TODO: Ignoring the lock file for now.
+yarn.lock