uddate the support libraries

klinker24 · Jun 12, 2017 · fe56f2c · fe56f2c
1 parent f78aa02
commit fe56f2c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### v1.4.1
+
+* Update dependencies
+  * Support library now has vastly improved nested scrolling (v26.0.0)
+
 ### v1.4.0
 
 * Create a `DragDismissDelegate` and `DragDismissRecyclerViewDelegate` to handle the drag-dismiss functionality, for those that don't want to extend the `DragDismissActivity` and `DragDismissRecyclerViewActivity`.

diff --git a/build.gradle b/build.gradle
@@ -26,6 +26,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven { url "https://maven.google.com" }
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -14,16 +14,16 @@
 # limitations under the License.
 #
 
-GRADLE_PLUGIN_VERSION=2.3.0
+GRADLE_PLUGIN_VERSION=2.3.1
 BUILD_TOOLS_VERSION=25.0.2
 
-ANDROID_SUPPORT_VERSION=25.2.0
+ANDROID_SUPPORT_VERSION=26.0.0-beta2
 
 MIN_SDK=15
-TARGET_SDK=25
-COMPILE_SDK=25
+TARGET_SDK=26
+COMPILE_SDK=26
 
-VERSION_NAME=1.4.0
+VERSION_NAME=1.4.1
 VERSION_CODE=1
 GROUP=com.klinkerapps
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -48,11 +48,11 @@ dependencies {
     compile "com.android.support:design:${ANDROID_SUPPORT_VERSION}"
 
     testCompile 'junit:junit:4.12'
-    testCompile "org.robolectric:robolectric:3.2.2"
-    testCompile 'org.mockito:mockito-all:1.9.5'
+    testCompile "org.robolectric:robolectric:3.3.2"
+    testCompile 'org.mockito:mockito-all:1.10.8'
     testCompile 'org.powermock:powermock-mockito-release-full:1.6.1'
     testCompile 'org.powermock:powermock-module-junit4-rule:1.6.0'
-    testCompile 'org.powermock:powermock-api-mockito:1.6.0'
+    testCompile 'org.powermock:powermock-api-mockito:1.6.1'
     testCompile 'org.powermock:powermock-classloading-xstream:1.6.0'
     testCompile 'org.apache.maven:maven-ant-tasks:2.1.3'
 }