Skip to content

Commit bb269be

Browse files
committed
Update build to Gradle 4.1
1 parent 7972585 commit bb269be

File tree

4 files changed

+19
-12
lines changed

4 files changed

+19
-12
lines changed

gradle/wrapper/gradle-wrapper.jar

475 Bytes
Binary file not shown.
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Thu Jun 01 17:43:15 EDT 2017
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

gradlew

+8-7
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -155,13 +155,14 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
for s in "${@}" ; do
159-
s=\"$s\"
160-
APP_ARGS=$APP_ARGS" "$s
161-
done
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
161+
}
162+
APP_ARGS=$(save "$@")
162163

163164
# Collect all arguments for the java command, following the shell quoting and substitution rules
164-
eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
165166

166167
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
167168
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then

kotlin-guiced.gradle.kts

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import org.gradle.api.publish.maven.MavenPublication
22
import org.gradle.api.tasks.bundling.Jar
3+
import org.gradle.api.tasks.wrapper.Wrapper
34

45
buildscript {
56
repositories {
@@ -55,9 +56,9 @@ subprojects {
5556
}
5657

5758
dependencies {
58-
compile(kotlinModule("stdlib"))
59-
compile(kotlinModule("reflect"))
60-
testCompile(group = "io.kotlintest", name = "kotlintest", version = "2.0.2")
59+
"compile"(kotlin("stdlib"))
60+
"compile"(kotlin("reflect"))
61+
"testCompile"(create(group = "io.kotlintest", name = "kotlintest", version = "2.0.2"))
6162
}
6263

6364
val sourceJarTask = task<Jar>("sourceJar") {
@@ -80,6 +81,12 @@ subprojects {
8081

8182
configurations.create(PUBLISHED_CONFIGURATION_NAME)
8283

84+
task<Wrapper>("wrapper") {
85+
description = "Configure the version of gradle to download and use"
86+
gradleVersion = "4.1"
87+
distributionType = Wrapper.DistributionType.ALL
88+
}
89+
8390
/**
8491
* Retrieves or configures the [bintray][com.jfrog.bintray.gradle.BintrayExtension] project extension.
8592
*/

0 commit comments

Comments
 (0)