Travis CI script passes build now

mrblackfree · Feb 17, 2015 · 0d3553d · 0d3553d
1 parent 331937a
commit 0d3553d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 55 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,61 +1,33 @@
-language: java
+language: android
 
 branches:
   only:
     - develop
     - master
 
-jdk: oraclejdk7
-
-env:
-  global:
-    - ANDROID_SDK_VERSION="r24"
-
-notifications:
-  email: false
-
-
-before_install:
-
-  # environment info
-  - gradle -v
-  - uname -a
-
-  # required libs for android build tools
-  # Update a system for ia32 libraries
-  - sudo apt-get update -qq
-  - if [ `uname -m` = x86_64 ]; then sudo apt-get update; fi
-  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
-
-  # for gradle output style
-  - export TERM=dumb
-
-  # newer version of gradle
-  - wget http://services.gradle.org/distributions/gradle-1.12-bin.zip
-  - unzip -qq gradle-1.12-bin.zip
-  - export GRADLE_HOME=$PWD/gradle-1.11
-  - export PATH=$GRADLE_HOME/bin:$PATH
-
-  # just to test gradle version, against our provided one
-  - ./gradlew -v
-
-  # newest android SDK
-  - wget http://dl.google.com/android/android-sdk_${ANDROID_SDK_VERSION}-linux.tgz
-  - tar -zxf android-sdk_${ANDROID_SDK_VERSION}-linux.tgz
-  - export ANDROID_HOME=`pwd`/android-sdk-linux
-  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-
-  # manually set sdk.dir variable, according to local paths
-  - echo "sdk.dir=$ANDROID_HOME" > local.properties
-
-  # Install required components.
-  # For a full list, run `android list sdk -a --extended`
-  - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
-  - echo yes | android update sdk --all --filter build-tools-21.0.0 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter android-21 --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-google-m2repository --no-ui --force > /dev/null
-  - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
+android:
+  components:
+    # Uncomment the lines below if you want to
+    # use the latest revision of Android SDK Tools
+    - platform-tools
+    - tools
+
+    # The BuildTools version used by your project
+    - build-tools-21.1.2
+
+    # The SDK version used to compile your project
+    - android-21
+
+    # Additional components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+    - addon-google_apis-google-19
+
+    # Specify at least one system image,
+    # if you need to run emulator(s) during your tests
+    - sys-img-armeabi-v7a-android-19
+    - sys-img-x86-android-17
 
 # Build
 script: ./gradlew clean build

diff --git a/omniNotes/build.gradle b/omniNotes/build.gradle
@@ -32,9 +32,9 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFile getDefaultProguardFile('proguard-android.txt')
+            //proguardFile getDefaultProguardFile('proguard-android.txt')
 
-//            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             applicationVariants.all { variant ->
                 variant.outputs.each { output ->
                     output.outputFile = new File(
@@ -45,6 +45,7 @@ android {
         }
     }
     lintOptions {
+        abortOnError false
         disable 'MissingTranslation'
     }
     compileOptions {
@@ -74,7 +75,6 @@ dependencies {
     compile 'com.github.bumptech.glide:glide:3.4.0'
     compile 'com.afollestad:material-dialogs:0.5.6'
     compile "com.google.android.gms:play-services-identity:${GPS_VERSION}"
-//    compile "com.google.android.gms:play-services-base:${GPS_VERSION}"
 
     compile 'it.feio.android:simplegallery:1.1.0'
     compile 'it.feio.android:springpadimporter:1.0.0'