Updated Travis Settings

wasabeef · wasabeef · commit d3555a9923a5 · 2014-11-24T23:46:23.000+09:00
diff --git a/.travis.yml b/.travis.yml
@@ -7,17 +7,34 @@ android:
   components:
     - build-tools-21.0.2
     - android-21
+    - extra-google-m2repository
+    - extra-android-m2repository
 
   licenses:
-    - 'android-sdk-license.*'
+    - 'android-sdk-license-.+'
+
+notifications:
+  email: false
+
+before_script:
+  - sudo service postgresql stop || true
+  - sudo service mysql stop || true
+  - sudo service memcached stop || true
+  - sudo service bootlogd stop || true
+  - sudo service elasticsearch stop || true
+  - sudo service mongodb stop || true
+  - sudo service neo4j stop || true
+  - sudo service cassandra stop || true
+  - sudo service riak stop || true
+  - sudo service rsync stop || true
+  - sudo service x11-common stop || true
 
 before_install:
   - wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin
   - chmod +x android-ndk-r10c-linux-x86_64.bin
   - ./android-ndk-r10c-linux-x86_64.bin | egrep -v ^Extracting
   - export ANDROID_NDK_HOME=`pwd`/android-ndk-r10c
   - export PATH=${PATH}:${ANDROID_NDK_HOME}
-  - echo "ndk.dir=ANDROID_NDK_HOME" > local.properties
 
 script:
-  - ./gradlew build --info
+  - ./gradlew assemble --info
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -35,5 +35,5 @@ repositories {
 dependencies {
     compile project(':library')
 //    compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:+'
-    compile 'com.android.support:support-v4:21.0.2'
+    compile 'com.android.support:support-v4:21.+'
 }

Original file line number	Diff line number	Diff line change
`@@ -35,5 +35,5 @@ repositories {`
`35`	`35`	`dependencies {`
`36`	`36`	`compile project(':library')`
`37`	`37`	`// compile 'jp.co.cyberagent.android.gpuimage:gpuimage-library:+'`
`38`		`- compile 'com.android.support:support-v4:21.0.2'`
	`38`	`+ compile 'com.android.support:support-v4:21.+'`
`39`	`39`	`}`