Skip to content

Commit 46dda89

Browse files
committed
Adjusted tests to work without jcenter
1 parent b3e72af commit 46dda89

File tree

7 files changed

+12
-8
lines changed

7 files changed

+12
-8
lines changed

NEWS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
## 3.1
44

5-
Major changes & enhancments
6-
* Removed jcenter 2nd default repo (apart from maven-central)
5+
Major changes & enhancements
6+
* Removed jcenter as default dependency (apart from maven-central)
7+
78

89
## 3.0
910

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,18 +322,18 @@ Using annotations instead of comment directives to configure scripts is cleaner
322322

323323
```kotlin
324324
// annotation-driven script configuration
325-
@file:DependsOn("de.mpicbg.scicomp:kutils:0.4")
325+
@file:DependsOn("com.github.holgerbrandl:kutils:0.12")
326326

327327
// comment directive
328-
//DEPS de.mpicbg.scicomp:kutils:0.4
328+
//DEPS com.github.holgerbrandl:kutils:0.12
329329
```
330330

331331
To do so `kscript` supports [annotations](https://github.com/holgerbrandl/kscript-annotations) to be used instead of comment directives:
332332
```kotlin
333333
#!/usr/bin/env kscript
334334

335335
// Declare dependencies
336-
@file:DependsOn("de.mpicbg.scicomp:kutils:0.4")
336+
@file:DependsOn("com.github.holgerbrandl:kutils:0.12")
337337
@file:DependsOn("com.beust:klaxon:0.24", "com.github.kittinunf.fuel:fuel:1.3.1")
338338

339339

@@ -408,7 +408,7 @@ To create an interactive kotlin shell (aka [REPL](https://kotlinlang.org/docs/tu
408408
For example, let's assume the following short script, named `CountRecords.kts`
409409
```kotlin
410410
#!/usr/bin/env kscript
411-
@file:DependsOn("de.mpicbg.scicomp:kutils:0.4")
411+
@file:DependsOn("com.github.holgerbrandl:kutils:0.12")
412412

413413
import de.mpicbg.scicomp.bioinfo.openFasta
414414

script.kts

Whitespace-only changes.

src/main/kotlin/kscript/app/AppHelpers.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ plugins {
296296
297297
repositories {
298298
mavenLocal()
299+
mavenCentral()
299300
$stringifiedRepos
300301
}
301302
@@ -432,6 +433,7 @@ plugins {
432433
433434
repositories {
434435
mavenLocal()
436+
mavenCentral()
435437
$stringifiedRepos
436438
}
437439

src/main/kotlin/kscript/app/Kscript.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import kotlin.system.exitProcess
2121
* @author Holger Brandl
2222
*/
2323

24-
const val KSCRIPT_VERSION = "3.0.2"
24+
const val KSCRIPT_VERSION = "3.1"
2525

2626
val selfName = System.getenv("CUSTOM_KSCRIPT_NAME") ?: "kscript"
2727

test/TestsReadme.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ sdk list kotlin
5555
#sdk use kotlin 1.3.72
5656
#sdk use kotlin 1.4.10
5757

58+
${KSCRIPT_HOME}/test/test_suite.sh
5859
${KSCRIPT_HOME}/test/test_suite.sh
5960

6061
# # run again with kotlin 1.0.X

test/resources/custom_dsl/mydsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export CUSTOM_KSCRIPT_NAME='mydsl'
44

55
export CUSTOM_KSCRIPT_PREAMBLE='
66
// declare dependencies
7-
@file:DependsOn("de.mpicbg.scicomp:kutils:0.4")
7+
@file:DependsOn("com.github.holgerbrandl:kutils:0.12")
88
99
// make sure to also support includes in here
1010
// @file:Include("util.kt")

0 commit comments

Comments
 (0)