Skip to content

Commit 35c1862

Browse files
rossbacherAndreas Rossbacherholgerbrandl
authored
Update gradle to 6.7 (#282)
Update com.github.johnrengelman.shadow to latest Fix any warnings that were created by the new gradle version Co-authored-by: Andreas Rossbacher <[email protected]> Co-authored-by: Holger Brandl <[email protected]>
1 parent 521664d commit 35c1862

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

build.gradle.kts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ group = "com.github.holgerbrandl.kscript.launcher"
1010
dependencies {
1111
compile("com.offbytwo:docopt:0.6.0.20150202")
1212

13-
compile("com.jcabi:jcabi-aether:0.10.1") {
13+
implementation("com.jcabi:jcabi-aether:0.10.1") {
1414
exclude("org.hibernate", "hibernate-validator")
1515
exclude("org.slf4j", "slf4j-api")
1616
exclude("org.slf4j", "jcl-over-slf4j")
@@ -19,12 +19,12 @@ dependencies {
1919
exclude("org.kuali.maven.wagons", "maven-s3-wagon")
2020
}
2121
// compile("com.jcabi:jcabi-aether:0.10.1:sources") //can be used for debugging, but somehow adds logging to dependency resolvement?
22-
compile("org.apache.maven:maven-core:3.0.3")
23-
compile("org.slf4j:slf4j-nop:1.7.25")
22+
implementation("org.apache.maven:maven-core:3.0.3")
23+
implementation("org.slf4j:slf4j-nop:1.7.25")
2424

25-
testCompile("junit:junit:4.12")
26-
testCompile( "io.kotlintest:kotlintest:2.0.7")
27-
testCompile(kotlin("script-runtime"))
25+
testImplementation("junit:junit:4.12")
26+
testImplementation( "io.kotlintest:kotlintest:2.0.7")
27+
testImplementation(kotlin("script-runtime"))
2828
}
2929

3030
repositories {
@@ -33,11 +33,11 @@ repositories {
3333

3434
val shadowJar by tasks.getting(ShadowJar::class) {
3535
// set empty string to classifier and version to get predictable jar file name: build/libs/kscript.jar
36-
archiveName = "kscript.jar"
36+
archiveFileName.set("kscript.jar")
3737
doLast {
3838
copy {
3939
from(File(projectDir, "src/kscript"))
40-
into(archivePath.parentFile)
40+
into(archiveFile.get().asFile.parentFile)
4141
}
4242
}
4343
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)