Skip to content

Commit 12822b3

Browse files
authored
Merge pull request CymChad#2220 from AllenCoder/master
fix build error
2 parents a07fa14 + 4693c0c commit 12822b3

File tree

5 files changed

+16
-19
lines changed

5 files changed

+16
-19
lines changed

.travis.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,18 @@ jdk: oraclejdk8
33
sudo: false
44

55
android:
6-
components:
6+
components:
77
- tools
8-
- build-tools-26.0.2
9-
- android-26
8+
- platform-tools
9+
- build-tools-27.0.2
10+
- android-27
1011
- extra-android-m2repository
1112
- extra-android-support
12-
licenses:
13-
- android-sdk-license-.+
14-
- '.+'
15-
1613
before_install:
1714
- chmod +x gradlew
1815
- mkdir "$ANDROID_HOME/licenses" || true
19-
- echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
20-
- echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
16+
# Hack to accept Android licenses
17+
- yes | sdkmanager "platforms;android-27"
2118

2219
script:
2320
- ./gradlew assembleRelease

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
4+
compileSdkVersion 27
55

66
defaultConfig {
77
applicationId "com.chad.baserecyclerviewadapterhelper"
88
minSdkVersion 14
9-
targetSdkVersion 26
9+
targetSdkVersion 27
1010
versionCode 5
1111
versionName "2.1"
1212
}
@@ -28,9 +28,9 @@ dependencies {
2828
implementation project(path: ':library')
2929
implementation project(':material-spinner-1.0.5')
3030
implementation 'com.github.bumptech.glide:glide:3.7.0'
31-
implementation 'com.android.support:design:26.1.0'
32-
implementation 'com.android.support:cardview-v7:26.1.0'
33-
implementation 'com.android.support:appcompat-v7:26.1.0'
31+
implementation 'com.android.support:design:27.1.1'
32+
implementation 'com.android.support:cardview-v7:27.1.1'
33+
implementation 'com.android.support:appcompat-v7:27.1.1'
3434
implementation 'com.kyleduo.switchbutton:library:2.0.0'
3535
implementation 'com.orhanobut:logger:2.1.1'
3636
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77

88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.0'
10+
classpath 'com.android.tools.build:gradle:3.1.2'
1111
}
1212
}
1313

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

library/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.android.library'
22
android {
3-
compileSdkVersion 26
3+
compileSdkVersion 27
44

55
defaultConfig {
66
minSdkVersion 11
7-
targetSdkVersion 26
7+
targetSdkVersion 27
88
versionCode 1
99
versionName "1.0"
1010
}
@@ -48,5 +48,5 @@ artifacts {
4848
dependencies {
4949

5050
implementation fileTree(include: ['*.jar'], dir: 'libs')
51-
compileOnly 'com.android.support:recyclerview-v7:26.1.0'
51+
compileOnly 'com.android.support:recyclerview-v7:27.1.1'
5252
}

0 commit comments

Comments
 (0)