Merge pull request #2220 from AllenCoder/master

fix build error
CymChad · May 9, 2018 · 12822b3 · 12822b3
2 parents a07fa14 + 4693c0c
commit 12822b3
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 19 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,21 +3,18 @@ jdk: oraclejdk8
 sudo: false
 
 android:
-  components:
+components:
     - tools
-    - build-tools-26.0.2
-    - android-26
+    - platform-tools
+    - build-tools-27.0.2
+    - android-27
     - extra-android-m2repository
     - extra-android-support
-  licenses:
-      - android-sdk-license-.+
-      - '.+'
-
 before_install:
   - chmod +x gradlew
   - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  # Hack to accept Android licenses
+  - yes | sdkmanager "platforms;android-27"
 
 script:
   - ./gradlew assembleRelease
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
 
     defaultConfig {
         applicationId "com.chad.baserecyclerviewadapterhelper"
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 5
         versionName "2.1"
     }
@@ -28,9 +28,9 @@ dependencies {
     implementation project(path: ':library')
     implementation project(':material-spinner-1.0.5')
     implementation 'com.github.bumptech.glide:glide:3.7.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:cardview-v7:26.1.0'
-    implementation 'com.android.support:appcompat-v7:26.1.0'
+    implementation 'com.android.support:design:27.1.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.kyleduo.switchbutton:library:2.0.0'
     implementation 'com.orhanobut:logger:2.1.1'
 }
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
     }
 }
 

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-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
 
     defaultConfig {
         minSdkVersion 11
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -48,5 +48,5 @@ artifacts {
 dependencies {
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    compileOnly 'com.android.support:recyclerview-v7:26.1.0'
+    compileOnly 'com.android.support:recyclerview-v7:27.1.1'
 }