Skip to content

Commit 136218d

Browse files
committed
Documentation updates. Removed release script (working on better solution)
Signed-off-by: Marcin Kuszczak <1508798+aartiPl@users.noreply.github.com>
1 parent 488fa95 commit 136218d

File tree

4 files changed

+13
-47
lines changed

4 files changed

+13
-47
lines changed

.github/workflows/release.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@ forget to update your `$PATH` accordingly.
113113
On MacOS you can install `kscript` also with [Homebrew](https://brew.sh/)
114114

115115
```bash
116-
brew install holgerbrandl/tap/kscript
116+
brew install kscripting/tap/kscript
117117
```
118118

119119
To upgrade to latest version
120120

121121
```bash
122122
brew update
123-
brew upgrade holgerbrandl/tap/kscript
123+
brew upgrade kscripting/tap/kscript
124124
```
125125

126126
#### Installation on Arch Linux
@@ -137,14 +137,15 @@ There is an uncommon directory layout of Kotlin package for Arch Linux, which ca
137137
default Kotlin package.
138138
Two workarounds for ArchLinux exists, which can be used to make 'kscript' working with ArchLinux:
139139

140-
1. Manually create symlinks in the system:
140+
1. Manually create symlinks in the system...
141141

142142
```shell
143143
sudo mkdir /usr/share/kotlin/bin
144144
sudo ln -s /usr/bin/kotlin /usr/share/kotlin/bin/kotlin
145145
sudo ln -s /usr/bin/kotlinc /usr/share/kotlin/bin/kotlinc
146146
```
147-
2. Install Kotlin using SdkMan:
147+
148+
2. ...or install Kotlin using SdkMan:
148149
[Installation of SdkMan](#installation)
149150

150151
The problem should be fixed in the Kotlin package for ArchLinux. See more in the Github issue:
@@ -158,7 +159,7 @@ To build `kscript` yourself, simply clone the repo and do
158159
./gradlew assemble
159160
160161
## Run kscript from output dir
161-
./build/libs/kscript
162+
./build/kscript/bin/kscript
162163
```
163164

164165
## Script Input Modes

TODO.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@
1515
* Compatibility with Kotlin Scripting
1616
* Onboard on docker etc. and other release channels
1717
* Abstraction for shell command (Command class containing e.g. environment variables)
18+
* Change description of kscript in SDKMan page
19+
* Deployments for Docker
20+
* Deployments for ArchLinux

build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ buildConfig {
3636

3737
buildConfigField("String", "APP_NAME", "\"${project.name}\"")
3838
buildConfigField("String", "APP_VERSION", provider { "\"${project.version}\"" })
39-
buildConfigField("java.time.ZonedDateTime",
39+
buildConfigField(
40+
"java.time.ZonedDateTime",
4041
"APP_BUILD_TIME",
4142
provider { "java.time.ZonedDateTime.parse(\"$dateTime\")" })
4243
buildConfigField("String", "KOTLIN_VERSION", provider { "\"${kotlinVersion}\"" })
@@ -241,7 +242,8 @@ publishing {
241242
maven {
242243
val releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
243244
val snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
244-
url = uri(if (project.version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
245+
val projectVersion = project.version.toString()
246+
url = uri(if (projectVersion.endsWith("-SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl)
245247

246248
credentials {
247249
username = project.findProperty("sonatype.user") as String? ?: System.getenv("SONATYPE_USER")

0 commit comments

Comments
 (0)