Skip to content

Commit

Permalink
Rebuilt with latest plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
lagergren committed Jan 17, 2024
1 parent f3f7afc commit 331cb42
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
18 changes: 7 additions & 11 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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) ?: ""
Expand All @@ -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)
}
}
}
}
Expand All @@ -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)
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#

[versions]
xdk = "0.4.4441"
xdk = "0.4.5"

gradle-node = "7.0.1"
node = "20.10.0"
Expand Down
3 changes: 3 additions & 0 deletions platformUI/gui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ yarn-error.log*

# local .env files
.env.local*

# TODO: Ignoring the lock file for now.
yarn.lock

0 comments on commit 331cb42

Please sign in to comment.