Merge pull request #66 from JSpiner/feature/fix-travis-license

travis 이슈 수정
ParkSangGwon · Nov 7, 2017 · 7cdcaec · 7cdcaec
2 parents 75cb0af + 3fe6bc5
commit 7cdcaec
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,22 +1,15 @@
 language: android
+jdk: oraclejdk8
 android:
   components:
-    - tools
-    - platform-tools
-    - tools
-    - build-tools-23.0.2
-    - android-23
-    - extra-google-m2repository
-    - extra-android-m2repository
-  licenses:
-    - 'android-sdk-preview-license-.+'
-    - 'android-sdk-license-.+'
-    - 'google-gdk-license-.+'
-
-install:
-  - echo y | android update sdk -u -a -t tools
-  - echo y | android update sdk -u -a -t platform-tools
-  - echo y | android update sdk -u -a -t build-tools-23.0.2
-  - echo y | android update sdk -u -a -t android-23
-  - echo y | android update sdk -u -a -t extra-google-m2repository
-  - echo y | android update sdk -u -a -t extra-android-m2repository
+  - tools
+  - platform-tools
+  - tools
+  - build-tools-25.0.0
+  - build-tools-23.0.2
+  - android-25
+  - android-23
+  - extra-android-m2repository
+  - extra-google-m2repository
+script:
+  - ./gradlew build
diff --git a/app/build.gradle b/app/build.gradle
@@ -31,6 +31,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    lintOptions {
+        abortOnError false
+    }
     buildToolsVersion '25.0.0'
 }
 

diff --git a/tedpermission-rx1/build.gradle b/tedpermission-rx1/build.gradle
@@ -15,7 +15,9 @@ android {
         }
     }
 
-
+    lintOptions {
+        abortOnError false
+    }
     buildToolsVersion '25.0.0'
 }
 

diff --git a/tedpermission-rx2/build.gradle b/tedpermission-rx2/build.gradle
@@ -15,7 +15,9 @@ android {
         }
     }
 
-
+    lintOptions {
+        abortOnError false
+    }
     buildToolsVersion '25.0.0'
 }
 

diff --git a/tedpermission/build.gradle b/tedpermission/build.gradle
@@ -16,6 +16,9 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
 
     buildToolsVersion '25.0.0'
 }