From 75a784cd604918636ba2138dd9aaedb07c2be5af Mon Sep 17 00:00:00 2001 From: Allen Date: Thu, 19 Apr 2018 10:19:57 +0800 Subject: [PATCH 1/4] Merge branch 'master' of https://github.com/CymChad/BaseRecyclerViewAdapterHelper # Conflicts: # app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/provider/ImgItemProvider.java # app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/provider/TextImgItemProvider.java # app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/provider/TextItemProvider.java # library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java # library/src/main/java/com/chad/library/adapter/base/provider/BaseItemProvider.java # library/src/main/java/com/chad/library/adapter/base/util/ProviderDelegate.java --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0f1313b9b..2e9a2b486 100644 --- 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.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2c612316..e6b1884fa 100644 --- 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 From 091790a81f098decff4ae05dd720746ce140fd4e Mon Sep 17 00:00:00 2001 From: Allen Date: Wed, 9 May 2018 10:13:06 +0800 Subject: [PATCH 2/4] Merge branch 'master' of https://github.com/CymChad/BaseRecyclerViewAdapterHelper # Conflicts: # app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/provider/ImgItemProvider.java # app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/provider/TextImgItemProvider.java # app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/provider/TextItemProvider.java # library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java # library/src/main/java/com/chad/library/adapter/base/provider/BaseItemProvider.java # library/src/main/java/com/chad/library/adapter/base/util/ProviderDelegate.java --- app/build.gradle | 10 +++++----- build.gradle | 2 +- library/build.gradle | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9742eebdd..1b12b7606 100644 --- 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 index 2e9a2b486..103aacfc4 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.1.1' + classpath 'com.android.tools.build:gradle:3.1.2' } } diff --git a/library/build.gradle b/library/build.gradle index c958b2ee8..159a7683e 100644 --- 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' } From 25dafd5a4982a9247d6390a4eb09528155f7b788 Mon Sep 17 00:00:00 2001 From: Allen Date: Wed, 9 May 2018 10:52:02 +0800 Subject: [PATCH 3/4] update travis config --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8908aab0..43b169c9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ sudo: false android: components: - tools - - build-tools-26.0.2 - - android-26 + - build-tools-27.0.2 + - android-27 - extra-android-m2repository - extra-android-support licenses: @@ -16,8 +16,8 @@ android: 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 From 4693c0ced2ba401fc86b908d764bfa206b4c2c0e Mon Sep 17 00:00:00 2001 From: Allen Date: Wed, 9 May 2018 11:09:35 +0800 Subject: [PATCH 4/4] update travis config --- .travis.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43b169c9f..abf269e44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,13 @@ jdk: oraclejdk8 sudo: false android: - components: +components: - tools + - 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