Target API 26.

bumptech · Aug 18, 2017 · cea1cce · cea1cce
1 parent 49142cf
commit cea1cce
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,8 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-25.0.2
-  - android-25
-  - extra-android-m2repository
-  - extra-android-support
+  - build-tools-26.0.1
+  - android-26
 
   licenses:
   - 'android-sdk-license.*'
@@ -24,7 +22,10 @@ after_success:
 
 before_cache:
   - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
 cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
+    - $HOME/.android/build-cache
+
diff --git a/build.gradle b/build.gradle
@@ -34,6 +34,9 @@ subprojects { project ->
         maven {
             url "https://oss.sonatype.org/content/repositories/snapshots"
         }
+        maven {
+            url "https://maven.google.com"
+        }
     }
 
     apply plugin: 'checkstyle'

diff --git a/gradle.properties b/gradle.properties
@@ -15,8 +15,7 @@ POM_SCM_DEV_CONNECTION=scm:[email protected]:bumptech/glide.git
 POM_DEVELOPER_ID=sjudd
 POM_DEVELOPER_NAME=Sam Judd
 POM_DEVELOPER_EMAIL[email protected]
-SUPPORT_V4_VERSION=25.3.1
-SUPPORT_V7_VERSION=25.3.1
+ANDROID_SUPPORT_VERSION=26.0.1
 VOLLEY_VERSION=1.0.0
 OK_HTTP_VERSION=3.0.1
 ANDROID_GRADLE_VERSION=2.3.0
@@ -31,9 +30,9 @@ TRUTH_VERSION=0.26
 FINDBUGS_VERSION=3.0.0
 JACOCO_VERSION=0.7.1.201405082137
 
-COMPILE_SDK_VERSION=25
-BUILD_TOOLS_VERSION=25.0.2
-TARGET_SDK_VERSION=25
+COMPILE_SDK_VERSION=26
+BUILD_TOOLS_VERSION=26.0.1
+TARGET_SDK_VERSION=26
 MIN_SDK_VERSION=14
 
 org.gradle.jvmargs=-Xmx2048M
diff --git a/integration/gifencoder/build.gradle b/integration/gifencoder/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     testCompile "junit:junit:${JUNIT_VERSION}"
     testCompile "org.mockito:mockito-all:${MOCKITO_VERSION}"
     testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
-    testCompile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
+    testCompile "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
 }
 
 android {

diff --git a/integration/okhttp/build.gradle b/integration/okhttp/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     annotationProcessor project(':annotation:compiler')
 
     compile "com.squareup.okhttp:okhttp:2.7.1"
-    compile "com.android.support:support-annotations:{$SUPPORT_V4_VERSION}"
+    compile "com.android.support:support-annotations:{$ANDROID_SUPPORT_VERSION}"
 }
 
 android {

diff --git a/integration/okhttp3/build.gradle b/integration/okhttp3/build.gradle
@@ -5,7 +5,7 @@ dependencies {
     annotationProcessor project(':annotation:compiler')
 
     compile "com.squareup.okhttp3:okhttp:${OK_HTTP_VERSION}"
-    compile "com.android.support:support-annotations:{$SUPPORT_V4_VERSION}"
+    compile "com.android.support:support-annotations:${ANDROID_SUPPORT_VERSION}"
 }
 
 android {

diff --git a/integration/recyclerview/build.gradle b/integration/recyclerview/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
     compile project(':library')
-    provided "com.android.support:recyclerview-v7:${SUPPORT_V7_VERSION}"
+    provided "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
 }
 
 android {

diff --git a/integration/volley/build.gradle b/integration/volley/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 dependencies {
     compile project(':library')
     compile "com.android.volley:volley:${VOLLEY_VERSION}"
-    compile "com.android.support:support-annotations:{$SUPPORT_V4_VERSION}"
+    compile "com.android.support:support-annotations:${ANDROID_SUPPORT_VERSION}"
     annotationProcessor project(':annotation:compiler')
 
     testCompile project(":testutil")

diff --git a/library/build.gradle b/library/build.gradle
@@ -19,16 +19,16 @@ dependencies {
     compile project(':third_party:gif_decoder')
     compile project(':third_party:disklrucache')
     compile project(':annotation')
-    compile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
-    provided "com.android.support:appcompat-v7:${SUPPORT_V7_VERSION}"
+    compile "com.android.support:support-fragment:${ANDROID_SUPPORT_VERSION}"
+    provided "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
     testCompile project(':testutil')
     testCompile 'com.google.guava:guava-testlib:18.0'
     testCompile "com.google.truth:truth:${TRUTH_VERSION}"
     testCompile "junit:junit:${JUNIT_VERSION}"
     testCompile "org.mockito:mockito-core:${MOCKITO_VERSION}"
     testCompile "org.robolectric:robolectric:${ROBOLECTRIC_VERSION}"
     testCompile "com.squareup.okhttp3:mockwebserver:${MOCKWEBSERVER_VERSION}"
-    testCompile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
+    testCompile "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
 }
 
 android.testOptions.unitTests.all {

diff --git a/samples/contacturi/build.gradle b/samples/contacturi/build.gradle
@@ -2,8 +2,7 @@ apply plugin: 'com.android.application'
 
 dependencies {
     compile project(':library')
-    compile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
-    compile "com.android.support:appcompat-v7:${SUPPORT_V7_VERSION}"
+    compile "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
     annotationProcessor project(':annotation:compiler')
 }
 

diff --git a/samples/flickr/build.gradle b/samples/flickr/build.gradle
@@ -7,10 +7,9 @@ dependencies {
     }
     annotationProcessor project(':annotation:compiler')
 
-    compile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
-    compile "com.android.support:appcompat-v7:${SUPPORT_V7_VERSION}"
+    compile "com.android.support:appcompat-v7:${ANDROID_SUPPORT_VERSION}"
     compile "com.mcxiaoke.volley:library:${VOLLEY_VERSION}"
-    compile "com.android.support:recyclerview-v7:${SUPPORT_V7_VERSION}"
+    compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
 }
 
 android {

diff --git a/samples/gallery/build.gradle b/samples/gallery/build.gradle
@@ -5,8 +5,7 @@ dependencies {
     compile(project(':integration:recyclerview')) {
         transitive = false
     }
-    compile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
-    compile "com.android.support:recyclerview-v7:${SUPPORT_V7_VERSION}"
+    compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
     annotationProcessor project(':annotation:compiler')
 }
 

diff --git a/samples/giphy/build.gradle b/samples/giphy/build.gradle
@@ -5,8 +5,8 @@ dependencies {
     compile(project(':integration:recyclerview')) {
         transitive = false
     }
-    compile 'com.google.code.gson:gson:2.4'
-    compile "com.android.support:recyclerview-v7:${SUPPORT_V7_VERSION}"
+    compile 'com.google.code.gson:gson:2.7'
+    compile "com.android.support:recyclerview-v7:${ANDROID_SUPPORT_VERSION}"
     annotationProcessor project(':annotation:compiler')
 }
 

diff --git a/third_party/gif_decoder/build.gradle b/third_party/gif_decoder/build.gradle
@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 dependencies {
-    compile "com.android.support:support-annotations:${SUPPORT_V4_VERSION}"
+    compile "com.android.support:support-annotations:${ANDROID_SUPPORT_VERSION}"
 
     testCompile project(':testutil')
-    testCompile "com.android.support:support-v4:${SUPPORT_V4_VERSION}"
+    testCompile "com.android.support:support-v4:${ANDROID_SUPPORT_VERSION}"
     testCompile "com.google.truth:truth:${TRUTH_VERSION}"
     testCompile "junit:junit:${JUNIT_VERSION}"
     testCompile "org.mockito:mockito-core:${MOCKITO_VERSION}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,9 @@ subprojects { project -> @@
             maven {
                 url "https://oss.sonatype.org/content/repositories/snapshots"
             }
+            maven {
+                url "https://maven.google.com"
+            }
         }
         apply plugin: 'checkstyle'
@@ Expand Down @@