From 8f1294fa33f6e02c52535527322a0b0b13435723 Mon Sep 17 00:00:00 2001 From: Andrew Charneski Date: Mon, 22 Apr 2024 10:10:00 -0400 Subject: [PATCH] 1.0.64 (#69) * 1.0.64 * Active tab buttons show initially --- core/build.gradle.kts | 8 ++++---- gradle.properties | 2 +- groovy/build.gradle.kts | 4 ++-- kotlin/build.gradle.kts | 4 ++-- webui/build.gradle.kts | 18 +++++++++--------- .../com/simiacryptus/skyenet/AgentPatterns.kt | 7 ++++++- .../com/simiacryptus/skyenet/TabbedDisplay.kt | 8 ++++++-- .../skyenet/webui/util/MarkdownUtil.kt | 2 +- 8 files changed, 31 insertions(+), 22 deletions(-) diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 40f48621..9f72e0c8 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -28,11 +28,11 @@ kotlin { val junit_version = "5.10.1" val logback_version = "1.4.11" -val jackson_version = "2.15.3" +val jackson_version = "2.17.0" dependencies { - implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.0.52") + implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.0.53") implementation("org.apache.commons:commons-text:1.11.0") @@ -77,12 +77,12 @@ tasks { compileKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } compileTestKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } test { diff --git a/gradle.properties b/gradle.properties index 95bf486e..ea8cddaa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ # Gradle Releases -> https://github.com/gradle/gradle/releases libraryGroup = com.simiacryptus.skyenet -libraryVersion = 1.0.63 +libraryVersion = 1.0.64 gradleVersion = 7.6.1 diff --git a/groovy/build.gradle.kts b/groovy/build.gradle.kts index 10a6708c..69997d5d 100644 --- a/groovy/build.gradle.kts +++ b/groovy/build.gradle.kts @@ -48,12 +48,12 @@ tasks { compileKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } compileTestKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } test { diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts index 403a1199..cef6eeb2 100644 --- a/kotlin/build.gradle.kts +++ b/kotlin/build.gradle.kts @@ -59,12 +59,12 @@ tasks { compileKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } compileTestKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } test { diff --git a/webui/build.gradle.kts b/webui/build.gradle.kts index 930a3896..a9f3ba34 100644 --- a/webui/build.gradle.kts +++ b/webui/build.gradle.kts @@ -32,10 +32,10 @@ kotlin { val kotlin_version = "2.0.0-Beta5" val jetty_version = "11.0.18" -val jackson_version = "2.15.3" +val jackson_version = "2.17.0" dependencies { - implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.0.52") + implementation(group = "com.simiacryptus", name = "jo-penai", version = "1.0.53") implementation(project(":core")) implementation(project(":kotlin")) @@ -89,11 +89,11 @@ dependencies { } sass { - omitSourceMapUrl = false - outputStyle = OutputStyle.EXPANDED - sourceMapContents = false - sourceMapEmbed = false - sourceMapEnabled = true + omitSourceMapUrl.set(false) + outputStyle.set(OutputStyle.EXPANDED) + sourceMapContents.set(false) + sourceMapEmbed.set(false) + sourceMapEnabled.set(true) } @@ -101,12 +101,12 @@ tasks { compileKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } compileTestKotlin { compilerOptions { - javaParameters = true + javaParameters.set(true) } } test { diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/AgentPatterns.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/AgentPatterns.kt index 54bac055..7125fb70 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/AgentPatterns.kt +++ b/webui/src/main/kotlin/com/simiacryptus/skyenet/AgentPatterns.kt @@ -25,7 +25,12 @@ object AgentPatterns { |
|${ map.keys.joinToString("\n") { key -> - """""" + """""" }/*.indent(" ")*/ } |
diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/TabbedDisplay.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/TabbedDisplay.kt index 7f54a181..623814e6 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/TabbedDisplay.kt +++ b/webui/src/main/kotlin/com/simiacryptus/skyenet/TabbedDisplay.kt @@ -27,8 +27,12 @@ open class TabbedDisplay( open fun renderTabButtons() = """
${ - tabs.toMap().keys.withIndex().joinToString("\n") { (idx, key: String) -> - """""" + tabs.withIndex().joinToString("\n") { (idx, pair) -> + if (idx == selectedTab) { + """""" + } else { + """""" + } } }
""".trimIndent() diff --git a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/util/MarkdownUtil.kt b/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/util/MarkdownUtil.kt index 07a4bb68..1c95b36b 100644 --- a/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/util/MarkdownUtil.kt +++ b/webui/src/main/kotlin/com/simiacryptus/skyenet/webui/util/MarkdownUtil.kt @@ -45,7 +45,7 @@ object MarkdownUtil { val replacement = if (tabs) """ |
|
- | + | | |
|
$mermaidDiagramHTML