Преглед на файлове

use Gradle v4.10, android tools v3.1.4, bintray plugin v1.8.4

Stephen Gold преди 7 години
родител
ревизия
694232e269
променени са 5 файла, в които са добавени 12 реда и са изтрити 16 реда
  1. 1 1
      .travis.yml
  2. 3 6
      build.gradle
  3. BIN
      gradle/wrapper/gradle-wrapper.jar
  4. 5 6
      gradle/wrapper/gradle-wrapper.properties
  5. 3 3
      gradlew

+ 1 - 1
.travis.yml

@@ -1,5 +1,5 @@
 language: java
-sudo: false
+sudo: true
 dist: precise
 
 branches:

+ 3 - 6
build.gradle

@@ -1,10 +1,11 @@
 buildscript {
     repositories {
+        google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
+        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
@@ -115,10 +116,6 @@ task mergedSource(type: Copy){
 
 }
 
-task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') {
-    gradleVersion = '4.1'
-}
-
 ext {
     ndkCommandPath  = ""
     ndkExists       = false

BIN
gradle/wrapper/gradle-wrapper.jar


+ 5 - 6
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Sep 17 22:55:30 EDT 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip

+ 3 - 3
gradlew

@@ -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 " "
 }