Kscript 4.2.2 (#400)

== [4.2.2] - 2023-04-29 === Added * Updated Gradle to version 8.0.2 === Fixed * Fixed handling path with spaces on Windows https://github.com/kscripting/kscript/issues/397[#397] (thanks to https://github.com/ckaag[ckaag]) * Fixed build script (dependencies between tasks) * Fixed reading Unicode characters from executed scriptlets * Fixed Windows integration tests --------- Signed-off-by: Marcin Kuszczak <[email protected]> Co-authored-by: Christopher Kaag <[email protected]>
kscripting · Apr 29, 2023 · 1c97c21 · 1c97c21
1 parent 62be656
commit 1c97c21
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 104 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
-          gradle-version: wrapper
+          gradle-version: 8.0.2
 
       - name: Install dependencies for ${{ runner.os }}
         shell: bash
@@ -91,9 +91,7 @@ jobs:
         shell: cmd
         run: |
           echo "Windows test..."
-          gradle clean assemble test
-          if %errorlevel% neq 0 exit /b %errorlevel%
-          gradle -DosType=windows -DincludeTags="windows" integrationTest
+          gradle -DosType=windows -DincludeTags="windows" clean assemble test integrationTest
 
       - name: Install Cygwin (only Windows)
         if: matrix.variant == 'cygwin'

diff --git a/NEWS.adoc b/NEWS.adoc
@@ -1,22 +1,36 @@
 = Changes
 
+== [4.2.2] - 2023-04-29
+
+=== Added
+
+* Updated Gradle to version 8.0.2
+
+=== Fixed
+
+* Fixed handling path with spaces on Windows https://github.com/kscripting/kscript/issues/397[#397] (thanks to https://github.com/ckaag[ckaag])
+* Fixed build script (dependencies between tasks)
+* Fixed reading Unicode characters from executed scriptlets
+* Fixed Windows integration tests
+
+
 == [4.2.1] - 2023-01-26
 
-*Enhancements*
+=== Added
 
 * Scoop installer (thanks to https://github.com/Dany-coder778[Dany-coder778] and https://github.com/goto1134[goto1134])
 
-*Bugfixes*
+=== Fixed
 
 * The correct way of resolving kscript binary on Windows (thanks to https://github.com/goto1134[goto1134])
 
 == [4.2.0] - 2023-01-14
 
-*Breaking changes*
+=== Breaking changes
 
 * Renamed environment variable from 'KSCRIPT_DIR' to 'KSCRIPT_DIRECTORY'
 
-*Enhancements*
+=== Added
 
 * New GitHub organization: http://github.com/kscripting[kscripting]
 * More work on Windows shell compatibility; most functionality works on Windows as on systems with bash
@@ -37,20 +51,20 @@
 * Improved DependencyResolver: aar archives are also included in classpath
 * When creating IntelliJ project Gradle and Idea are no more required
 
-*Bugfixes*
+=== Fixed
 
 * Fixed exit code on Windows
 
-== [4.1.x] - (last 4.1.1 - 2022-08-27)
+== [4.1.1] - 2022-08-27
 
-*Breaking changes*
+=== Breaking changes
 
 * Renamed env variables (cleanup):
  CUSTOM_KSCRIPT_PREAMBLE -&gt; KSCRIPT_PREAMBLE
  KSCRIPT_IDEA_COMMAND -&gt; KSCRIPT_COMMAND_IDEA
  KSCRIPT_GRADLE_COMMAND -&gt; KSCRIPT_COMMAND_GRADLE
 
-*Enhancements*
+=== Added
 
 * Windows support and proper Cygwin and MSys support
 * File argument for specific OS should be in format of that OS (eg. Cygwin: kscript /cygdrive/c/file.kts)
@@ -67,14 +81,14 @@
 * Deprecation of comment based annotations
 * Report for deprecated features (–report option)
 
-*Bugfixes*
+=== Fixed
 
 * Fix for dependency resolution
 * Fix for creation of Gradle files and their indentation
 * Fix for handling potentially duplicated file names in Idea projects
 * Fix for Idea runtime configuration
 
-== [4.0.x] - (last 4.0.3 - 2022-05-28)
+== [4.0.3] - 2022-05-28
 
 **Rewrite by https://github.com/aartiPl**
 
@@ -125,31 +139,30 @@ Misc
 * Changes for kscript dir allow simple implementation of config file if needed. (.kscript/kscript.config); Not
  implemented by me, but might be useful e.g. for storing preambles
 
-INCOMPATIBLE CHANGES:
+=== Breaking changes
 
 * In annotations the only allowed delimiter is coma "," (to allow options with arguments, separated by space)
 * Resolution of env variables is more restrictive - only vars expected by kscript can be resolved (for security - it's
  not good to include arbitrary strings from user env into the script)
 * Reworked caching mechanism
 
-== [3.2]
+== [3.2.0]
 
 Not released - incorporated in 4.0
 
 Major changes &amp; enhancements
 
-* Improved for relative script inclusions (Thanks to PR by **
- aartiPI** https://github.com/holgerbrandl/kscript/pull/330[#330])
+* Improved for relative script inclusions (Thanks to PR by ** aartiPI** https://github.com/holgerbrandl/kscript/pull/330[#330])
 * Fixed bootstrap header support (https://github.com/holgerbrandl/kscript/issues/324[#324])
 
-== [3.1]
+== [3.1.0]
 
 Major changes &amp; enhancements
 
 * Removed jcenter as default dependency repository
 * Updated tests and build integration to function without jcenter
 
-== [3.0]
+== [3.0.0]
 
 Major Enhancements
 
@@ -178,7 +191,7 @@ Incompatible API changes
  as `org.javamoney:moneta:1.3@pom`)
 * Dynamic version dependencies must be now declared as `log4j:log4j:[1.2,)` (and no longer as `log4j:log4j:1.2+`)
 
-== [2.9]
+== [2.9.0]
 
 Support environment variables in repository credentials (https://github.com/holgerbrandl/kscript/issues/159[#248])
 
@@ -193,15 +206,15 @@ Minor enhancements &amp; fixes:
 * Fixed bootstrap header (https://github.com/holgerbrandl/kscript/issues/159[#234])
 * Improved and documented basic testing support (https://github.com/holgerbrandl/kscript/issues/159[#247])
 
-== [2.8]
+== [2.8.0]
 
 Improvements &amp; Fixes
 
 * https://github.com/holgerbrandl/kscript/pull/214[#214] Added credentials support for `@file:MavenRepository`
  annotation (thanks to https://github.com/meonlol[@meonlol]
  for providing the PR and his patience)
 
-== [2.7]
+== [2.7.0]
 
 Improvements &amp; Fixes
 
@@ -214,7 +227,7 @@ Improvements &amp; Fixes
  with `--add-bootstrap-header`
 * https://github.com/holgerbrandl/kscript/issues/200[#200]: Expose script file name to script
 
-== [2.6]
+== [2.6.0]
 
 Major Improvements
 
@@ -232,7 +245,7 @@ Notable Bug Fixes
 * Fixed usage `@file:CompilerOpts` in combination with `@file:Include`
 * Renamed `kshell_from_kscript` to `kshell_kts`
 
-== [2.5]
+== [2.5.0]
 
 Major Improvements
 
@@ -248,7 +261,7 @@ Minor Enhancements
 * Allow to include same file from multiple files
 * Fixed: Space-containing argument propagation
 
-== [2.4]
+== [2.4.0]
 
 Major Enhancements:
 
@@ -270,7 +283,7 @@ Minor Enhancements:
 * Simplify Gradle config for script bootstrapping with IDEA (#86)
 * Added Gradle wrapper to the project (#87 and #88)
 
-== [2.3]
+== [2.3.0]
 
 Major Enhancements:
 
@@ -298,7 +311,7 @@ Minor Enhancements:
 * Simplified build instructions (fixes https://github.com/holgerbrandl/kscript/issues/60[#60])
 * Document dependencies of kscript (fixes https://github.com/holgerbrandl/kscript/issues/69[#69])
 
-== [2.2]
+== [2.2.0]
 
 * Logging of maven artifact downloads to stderr (fixes https://github.com/holgerbrandl/kscript/issues/23[#23])
 * Added `-s` / `--silent` to suppress all logging
@@ -310,12 +323,12 @@ Minor Enhancements:
 
 See link:README.adoc[README] for usage details.
 
-== [2.1]
+== [2.1.0]
 
 * support for annotation-driven script configuration
 * refactored support api mode into `-t` parameter
 
-== [2.0]
+== [2.0.0]
 
 * Reimplemented in kotlin (fixes https://github.com/holgerbrandl/kscript/issues/36[#36])
 * Added cygwin support (fixes https://github.com/holgerbrandl/kscript/issues/39[#39])
@@ -329,20 +342,20 @@ See link:README.adoc[README] for usage details.
 * Fixed `--self-update`
 * More robust self-update on OSses with file-locking (e.g. windows)
 
-== [1.5]
+== [1.5.0]
 
 * removed `curl` dependency
 * more streamlined dependency lookup
 
-== [1.4]
+== [1.4.0]
 
 Major new features
 
 * Redesigned https://github.com/holgerbrandl/kscript-support-api[support library] for streamlined tabular data
  processing. See http://holgerbrandl.github.io/kotlin/2017/05/08/kscript_as_awk_substitute.html[here] for an
  overview.
 
-== [1.3]
+== [1.3.0]
 
 Major new features
 
@@ -373,7 +386,7 @@ Other changes
 * More heuristics to guess `KOTLIN_HOME`
 * Cache cleanup `--clear-cache` now applies to jars, scripts, urls, and cached dependency lookups
 
-== [1.2]
+== [1.2.0]
 
 * Fixed compatibility with https://kotlinlang.org/docs/reference/whatsnew11.html[Kotlin v1.1]
  (fixes https://github.com/holgerbrandl/kscript/issues/15[#15])
@@ -382,7 +395,7 @@ Other changes
 * Compile jars should go to TEMP (fixes https://github.com/holgerbrandl/kscript/issues/13[#13])
 * started test-suite
 
-== [1.1]
+== [1.1.0]
 
 * Support for stdin and process substitution as script source. See link:examples[examples]
 * versioning and auto-update
@@ -391,6 +404,6 @@ Other changes
 * Added CLI help to `resdeps.kts`
 * Added option to clear dependency lookup cache: `resdeps.kts --clear-cache`
 
-== [1.0]
+== [1.0.0]
 
-Initial Release
+Initial Release
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
     application
     id("com.adarshr.test-logger") version "3.2.0"
     id("com.github.gmazzo.buildconfig") version "3.1.0"
-    id("com.github.johnrengelman.shadow") version "7.1.2"
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     `maven-publish`
     signing
     idea
@@ -27,7 +27,7 @@ repositories {
 }
 
 group = "io.github.kscripting"
-version = "4.2.1"
+version = "4.2.2"
 
 buildConfig {
     packageName(project.group.toString() + "." + project.name)
@@ -66,7 +66,6 @@ configurations {
 
 idea {
     module {
-        @Suppress("UnstableApiUsage")
         testSources.from(sourceSets["integration"].kotlin.srcDirs)
     }
 }
@@ -136,18 +135,18 @@ tasks.test {
 val createKscriptLayout by tasks.register<Copy>("createKscriptLayout") {
     dependsOn(shadowJar)
 
-    into(layout.projectDirectory)
+    into(layout.buildDirectory.dir("kscript"))
 
     from(shadowJar) {
-        into("build/kscript/bin")
+        into("bin")
     }
 
     from("src/kscript") {
-        into("build/kscript/bin")
+        into("bin")
     }
 
     from("src/kscript.bat") {
-        into("build/kscript/bin")
+        into("bin")
     }
 }
 
@@ -288,7 +287,6 @@ signing {
 }
 
 dependencies {
-    //compileOnly(fileTree("libs"))
     implementation("commons-cli:commons-cli:1.5.0")
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
@@ -297,28 +295,22 @@ dependencies {
 
     implementation("org.jetbrains.kotlin:kotlin-scripting-common:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-jvm:$kotlinVersion")
-//    implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies:$kotlinVersion")
     implementation("org.jetbrains.kotlin:kotlin-scripting-dependencies-maven-all:$kotlinVersion")
 
     implementation("org.apache.commons:commons-lang3:3.12.0")
     implementation("commons-io:commons-io:2.11.0")
     implementation("commons-codec:commons-codec:1.15")
-    implementation("com.konghq:unirest-java:3.13.13")
+    implementation("com.konghq:unirest-java:3.14.2")
 
     implementation("net.igsoft:tablevis:0.6.0")
-    implementation("io.arrow-kt:arrow-core:1.1.2")
+    implementation("io.github.kscripting:shell:0.5.2")
 
-    implementation("io.github.kscripting:shell:0.5.0")
+    implementation("org.slf4j:slf4j-nop:2.0.7")
 
-    implementation("org.slf4j:slf4j-nop:2.0.5")
+    implementation("org.semver4j:semver4j:4.3.0")
 
-    implementation("org.semver4j:semver4j:4.1.1")
 
-
-    testImplementation("org.junit.platform:junit-platform-suite-engine:1.9.2")
-    testImplementation("org.junit.platform:junit-platform-suite-api:1.9.2")
-    testImplementation("org.junit.platform:junit-platform-suite-commons:1.9.2")
-    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.2")
     testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.2")
     testImplementation("com.willowtreeapps.assertk:assertk-jvm:0.25")
     testImplementation("io.mockk:mockk:1.13.2")

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists