diff --git a/.github/workflows/release-artefact.yml b/.github/workflows/release-artefact.yml index faf089b..95e7ffb 100644 --- a/.github/workflows/release-artefact.yml +++ b/.github/workflows/release-artefact.yml @@ -61,7 +61,7 @@ jobs: PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD) CURRENT_TAG="v${{ env.VERSION }}${{ env.CHANNEL_SUFFIX }}" - echo "## Changelog: $PREV_TAG ? $CURRENT_TAG" > release_notes.md + echo "## Changelog: $PREV_TAG > $CURRENT_TAG" > release_notes.md echo "" >> release_notes.md ISSUES=$(git log ${PREV_TAG}..HEAD --pretty=format:"%s" | grep -oE '^#[0-9]+' | tr -d '#' | sort -nu) @@ -80,7 +80,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | gh release create "v${{ env.VERSION }}${{ env.CHANNEL_SUFFIX }}" \ - --title "Roky v${{ env.VERSION }} ${{ env.CHANNEL_SUFFIX }}" \ + --title "Roky v${{ env.VERSION }}${{ env.CHANNEL_SUFFIX }}" \ --notes-file release_notes.md \ ${{ env.PRERELEASE_FLAG }} \ build/distributions/Roky*.zip diff --git a/build.gradle.kts b/build.gradle.kts index e45122f..e20e370 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ - import org.jlleitschuh.gradle.ktlint.reporter.ReporterType.* plugins { @@ -56,6 +55,10 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0") + val jnaVersion = "5.14.0" + implementation("net.java.dev.jna:jna:$jnaVersion") + implementation("net.java.dev.jna:jna-platform:$jnaVersion") + testImplementation(kotlin("test")) testImplementation("io.kotest:kotest-assertions-core:5.9.1") testImplementation("org.junit.jupiter:junit-jupiter-params:5.1.0") @@ -79,6 +82,29 @@ tasks.jar { from(configurations.runtimeClasspath.get().map { if (it.isDirectory) it else zipTree(it) }) } +tasks.named("startScripts") { + doLast { + val text = + windowsScript.readText() + .replace( + oldValue = "set JAVA_EXE=java.exe", + newValue = "set JAVA_EXE=java.exe\r\nset JAVAW_EXE=javaw.exe", + ).replace( + oldValue = "set JAVA_EXE=%JAVA_HOME%/bin/java.exe", + newValue = "set JAVA_EXE=%JAVA_HOME%/bin/java.exe\r\nset JAVAW_EXE=%JAVA_HOME%/bin/javaw.exe", + ).replace( + oldValue = "\"%JAVA_EXE%\" %DEFAULT_JVM_OPTS%", + newValue = "start \"Roky\" \"%JAVAW_EXE%\" %DEFAULT_JVM_OPTS%", + ) + .replace( + regex = Regex("set CLASSPATH=%APP_HOME%\\\\lib\\\\.*"), + replacement = "set CLASSPATH=%APP_HOME%\\\\lib\\\\*", + ) + + windowsScript.writeText(text) + } +} + kotlin { jvmToolchain(17) }