diff --git a/WordPress/build.gradle b/WordPress/build.gradle index d33a3f1481c0..b85c3310b74d 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -4,7 +4,7 @@ buildscript { maven { url 'https://maven.fabric.io/repo' } } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0-beta4' classpath 'io.fabric.tools:gradle:1.+' } } diff --git a/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java b/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java index 9122897b0433..57a4f0072de7 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/AniUtils.java @@ -84,7 +84,11 @@ public static void showFab(final View view, final boolean show) { float toY = (show ? 0f : max); ObjectAnimator anim = ObjectAnimator.ofFloat(view, View.TRANSLATION_Y, fromY, toY); - anim.setInterpolator(show ? new DecelerateInterpolator() : new AccelerateInterpolator()); + if (show) { + anim.setInterpolator(new DecelerateInterpolator()); + } else { + anim.setInterpolator(new AccelerateInterpolator()); + } anim.setDuration(show ? Duration.LONG.toMillis(context) : Duration.SHORT.toMillis(context)); anim.addListener(new AnimatorListenerAdapter() { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5d226cc47cf7..3d77e0391f1e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Feb 08 18:55:28 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle index 3ef2e68e05cb..f72096df5310 100644 --- a/libs/analytics/WordPressAnalytics/build.gradle +++ b/libs/analytics/WordPressAnalytics/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0-beta4' } } diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 04132a03aa48..087136af56c5 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0-beta4' } } diff --git a/libs/editor/example/build.gradle b/libs/editor/example/build.gradle index 092a0951d237..dca063454614 100644 --- a/libs/editor/example/build.gradle +++ b/libs/editor/example/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0-beta4' } } diff --git a/libs/networking/WordPressNetworking/build.gradle b/libs/networking/WordPressNetworking/build.gradle index 121a77f0ae5b..16c0011c7cb4 100644 --- a/libs/networking/WordPressNetworking/build.gradle +++ b/libs/networking/WordPressNetworking/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0-beta4' } } diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle index 1b188062bde8..820fd38561fe 100644 --- a/libs/utils/WordPressUtils/build.gradle +++ b/libs/utils/WordPressUtils/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:2.0.0-beta4' } }