Merge pull request #3742 from wordpress-mobile/issue/update-to-androi…

…d-gradle-plugin-2.0 🎉Instant Run 🎉- Update to android gradle plugin 2.0
wordpress-mobile · Feb 12, 2016 · 2b41d14 · 2b41d14
2 parents d936c78 + 3825224
commit 2b41d14
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
     }
 }