Skip to content

Commit 6180b3d

Browse files
authored
Merge pull request #523 from rpmoore/v3_5_3
Upgrading to kotlin 1.2 and gradle 4.4
2 parents b75dbdf + 570c832 commit 6180b3d

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
*/
1515

1616
buildscript {
17-
ext.kotlin_version = '1.1.4-3'
17+
ext.kotlin_version = '1.2.0'
1818

1919
repositories {
2020
mavenCentral()
@@ -58,7 +58,7 @@ subprojects {
5858
}
5959

6060
task wrapper(type: Wrapper) {
61-
gradleVersion = '4.1'
61+
gradleVersion = '4.4'
6262
}
6363

6464
project(':ds3-sdk') {

gradle/wrapper/gradle-wrapper.jar

-75 Bytes
Binary file not shown.
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Fri Aug 25 15:48:59 MDT 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-4.1-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip

gradlew

Lines changed: 3 additions & 3 deletions
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,7 +155,7 @@ if $cygwin ; then
155155
fi
156156

157157
# Escape application args
158-
save ( ) {
158+
save () {
159159
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160160
echo " "
161161
}

0 commit comments

Comments
 (0)