From 5297de61eb82fb3010a8aa221cdd9162d9eafc44 Mon Sep 17 00:00:00 2001 From: Alex Bashkatov Date: Mon, 20 Dec 2021 17:50:00 +0200 Subject: [PATCH 1/2] remove unused brew formula --- .../distributions/ki/brew/Formula/ki.rb | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100755 src/jreleaser/distributions/ki/brew/Formula/ki.rb diff --git a/src/jreleaser/distributions/ki/brew/Formula/ki.rb b/src/jreleaser/distributions/ki/brew/Formula/ki.rb deleted file mode 100755 index 16d5fde..0000000 --- a/src/jreleaser/distributions/ki/brew/Formula/ki.rb +++ /dev/null @@ -1,24 +0,0 @@ -class {{brewFormulaName}} < Formula - desc "Extendable Kotlin interactive shell with code completion, and other features" - homepage "https://github.com/Kotlin/kotlin-interactive-shell" - url "{{distributionUrl}}" - version "{{projectVersion}}" - sha256 "{{distributionSha256}}" - license "Apache-2.0" - - bottle :unneeded - - depends_on "openjdk@8" - - def install - libexec.install "bin", "lib" - rm Dir["#{libexec}/bin/*.bat"] - bin.install Dir["#{libexec}/bin/*"] - bin.env_script_all_files libexec/"bin", Language::Java.overridable_java_home_env - end - - test do - output = shell_output("#{bin}/ki.sh <<< '' 2>&1 | grep ki-shell") - assert_match "ki-shell 0.3/1.4.32", output - end -end From 6b6a86c851b2c3f775ae0bbf1e2b014cbad8566a Mon Sep 17 00:00:00 2001 From: Alex Bashkatov Date: Mon, 20 Dec 2021 17:59:43 +0200 Subject: [PATCH 2/2] upgrade to kotlin 1.6.10 version, switch to kotlin-scripting-dependencies-maven-all --- ki-shell/pom.xml | 12 +++++++++--- pom.xml | 4 ++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ki-shell/pom.xml b/ki-shell/pom.xml index e3d8d5c..e21a93f 100644 --- a/ki-shell/pom.xml +++ b/ki-shell/pom.xml @@ -4,7 +4,7 @@ org.jetbrains.kotlinx ki - 0.3.4-SNAPSHOT + 0.4.0-SNAPSHOT ki-shell @@ -59,7 +59,7 @@ org.jetbrains.kotlin - kotlin-scripting-dependencies-maven + kotlin-scripting-dependencies-maven-all ${kotlin.version} @@ -72,6 +72,11 @@ kotlin-scripting-ide-services ${kotlin.version} + + org.jetbrains.kotlinx + kotlinx-coroutines-core + 1.5.2 + junit junit @@ -129,10 +134,11 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5.1 + 3.8.1 1.8 1.8 + -proc:none UTF-8 diff --git a/pom.xml b/pom.xml index eaad05f..02aaad1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jetbrains.kotlinx ki - 0.3.4-SNAPSHOT + 0.4.0-SNAPSHOT pom Ki Shell :: parent @@ -13,7 +13,7 @@ ki-shell - 1.4.32 + 1.6.10 1.8