diff options
author | Martin Fietz <martin.fietz@gmail.com> | 2017-09-23 09:22:32 +0200 |
---|---|---|
committer | Martin Fietz <martin.fietz@gmail.com> | 2017-09-23 09:22:32 +0200 |
commit | f20e04b590ae7f7d05126f34f81f50bd7227ad9e (patch) | |
tree | 71d9dc5ac7afb491a16c4c7fb0bf04ac9b6b27e3 | |
parent | 657a91b036aa86d94734f8b0ef88a036ec5a48a5 (diff) | |
download | AntennaPod-f20e04b590ae7f7d05126f34f81f50bd7227ad9e.zip |
Update gradle wrapper to 4.2
-rw-r--r-- | app/build.gradle | 2 | ||||
-rw-r--r-- | build.gradle | 4 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 54783 -> 54708 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 3 | ||||
-rwxr-xr-x | gradlew | 6 |
5 files changed, 7 insertions, 8 deletions
diff --git a/app/build.gradle b/app/build.gradle index c7b95421b..1472c43a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -179,7 +179,7 @@ task filterAbout { inputs.files files(["src/main/templates/about.html", "src/main/AndroidManifest.xml"]) outputs.file "src/main/assets/about.html" -} << { +} doLast { copy { from "src/main/templates/about.html" into "src/main/assets" diff --git a/build.gradle b/build.gradle index 47a4021a4..fbd0209af 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:2.2.3" + classpath "com.android.tools.build:gradle:2.3.3" classpath "me.tatarka:gradle-retrolambda:3.3.1" classpath "me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2" classpath "com.github.triplet.gradle:play-publisher:1.1.4" @@ -68,7 +68,7 @@ project.ext { } task wrapper(type: Wrapper) { - gradleVersion = "3.5" + gradleVersion = "4.2" } // free build hack: common functions diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex f55326309..736fb7d3f 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 304cdd1fd..52dd1f044 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed May 31 17:07:18 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -155,7 +155,7 @@ if $cygwin ; then fi # Escape application args -save ( ) { +save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } |