MA-3186 : Upgrade to Android Studio 2.3

Makefile

@@ -49,7 +49,7 @@ emulator :
 # flag prints too many logs that are mostly not needed, which make it exceed
 # the 4mb limit enforced by travis (so use it with caution)
 quality:
-	@./gradlew lintProdDebug
+	@./gradlew assembleDebug
 
 test:
 	@./gradlew testProdDebugUnitTestCoverage

OpenEdXMobile/build.gradle

@@ -14,7 +14,7 @@ buildscript {
         //Included for NewRelic
         classpath "com.newrelic.agent.android:agent-gradle-plugin:5.4.1"
 
-        classpath 'com.facebook.testing.screenshot:plugin:0.4'
+        classpath 'com.facebook.testing.screenshot:plugin:0.4.2'
 
     }
 }
@@ -162,10 +162,9 @@ dependencies {
     compile 'com.google.firebase:firebase-core:10.0.1'
 
     // Segment Library
-    compile('com.segment.analytics.android:analytics-core:3.4.0@aar') {
-        transitive = true
-    }
-    compile('com.segment.analytics.android:analytics-integration-google-analytics:3.4.0@aar') {
+    compile 'com.segment.analytics.android:analytics:4.2.6'
+
+    compile('com.segment.analytics.android.integrations:google-analytics:1.0.0') {
         exclude module: 'play-services-analytics'
         transitive = true
     }
@@ -355,6 +354,12 @@ android {
         showAll true
         warning 'TypographyQuotes', 'InvalidPackage'
         error 'StopShip', 'ContentDescription'
+        /**
+         * This is a bug that is fixed in the up-coming Android Studio 2.4 release.
+         * Link to issue: https://issuetracker.google.com/issues/37630182
+         */
+        //TODO: Remove the following line after we upgrade to Android Studio 2.4
+        disable 'GradleCompatible'
     }
 
     productFlavors {

OpenEdXMobile/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Jul 15 00:45:58 EDT 2015
+#Fri Mar 31 16:11:06 PKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

OpenEdXMobile/src/main/java/org/edx/mobile/module/registration/view/RegistrationOptionSpinner.java

@@ -3,16 +3,16 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v7.widget.AppCompatSpinner;
 import android.util.AttributeSet;
 import android.widget.ArrayAdapter;
-import android.widget.Spinner;
 
 import org.edx.mobile.R;
 import org.edx.mobile.module.registration.model.RegistrationOption;
 
 import java.util.List;
 
-public class RegistrationOptionSpinner extends Spinner {
+public class RegistrationOptionSpinner extends AppCompatSpinner {
 
     private ArrayAdapter<RegistrationOption> adapter;
 

OpenEdXMobile/src/main/java/org/edx/mobile/util/images/ShareUtils.java

@@ -25,6 +25,7 @@ public static Intent newShareIntent(@NonNull String text) {
                 .setType("text/plain");
     }
 
+    @SuppressWarnings("RestrictedApi")
     public static void showShareMenu(@NonNull Intent shareIntent, @NonNull View anchor,
                                      final @NonNull ShareMenuItemListener listener) {
         final Context context = anchor.getContext();
@@ -43,6 +44,8 @@ public boolean onMenuItemClick(MenuItem item) {
                 }
             });
         }
+
+        // TODO: Find an alternative to following usage of support MenuPopupHelper which is hidden in the support package
         // As PopupMenu doesn't support to show icons in main menu, use MenuPopupHelper for it
         final MenuPopupHelper menuHelper = new MenuPopupHelper(context, (MenuBuilder) popupMenu.getMenu(), anchor);
         menuHelper.setForceShowIcon(true);

OpenEdXMobile/src/main/java/org/edx/mobile/view/custom/EdxRatingBar.java

@@ -5,6 +5,7 @@
 import android.graphics.drawable.LayerDrawable;
 import android.support.annotation.ColorInt;
 import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.AppCompatRatingBar;
 import android.util.AttributeSet;
 import android.view.accessibility.AccessibilityEvent;
 import android.widget.RatingBar;
@@ -15,7 +16,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class EdxRatingBar extends RatingBar {
+public class EdxRatingBar extends AppCompatRatingBar {
     @ColorInt
     private final int UNSELECTED_STAR_COLOR = ContextCompat.getColor(getContext(), R.color.edx_brand_gray_back);
     @ColorInt

OpenEdXMobile/src/main/java/org/edx/mobile/view/custom/TitleRowView.java

@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
+import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -50,8 +51,8 @@ private void setAttributes(Context context, AttributeSet attrs) {
         float fontSize = attrArray.getDimension(styleable.TitleRowView_titleFontSize, 12.0f);
         DecorationStyle decorationStyle =DecorationStyle.values()[attrArray.getInt(styleable.TitleRowView_decorationStyle, DecorationStyle.CENTER.ordinal())];
         int textColor = attrArray.getColor(styleable.TitleRowView_android_textColor, Color.BLACK);
-        int leftColor = attrArray.getColor(styleable.TitleRowView_leftColor, color.grey_act_background);
-        int rightColor = attrArray.getColor(styleable.TitleRowView_rightColor, color.grey_act_background);
+        int leftColor = attrArray.getColor(styleable.TitleRowView_leftColor, ContextCompat.getColor(context, color.grey_act_background));
+        int rightColor = attrArray.getColor(styleable.TitleRowView_rightColor, ContextCompat.getColor(context, color.grey_act_background));
 
         if ( decorationStyle !=  DecorationStyle.LEFT ) {
             View leftDashView = new View(context);

android-iconify-fontawesome/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         repositories {
             jcenter()

android-iconify/build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         repositories {
             jcenter()
@@ -23,8 +23,9 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_6
         targetCompatibility JavaVersion.VERSION_1_6
     }
+    buildToolsVersion BUILD_TOOLS_VERSION
 }
 
 dependencies {
-    compile 'com.android.support:support-annotations:23.1.1'
+    compile 'com.android.support:support-annotations:25.3.1'
 }

android-iconify/src/main/java/com/joanzapata/iconify/internal/ParsingUtil.java

@@ -4,6 +4,7 @@
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.support.annotation.CheckResult;
+import android.support.annotation.FloatRange;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.support.annotation.Size;
@@ -172,14 +173,14 @@ public static int getColorFromResource(@NonNull Context context,
 
     @CheckResult
     public static float dpToPx(@NonNull Context context,
-            @IntRange(from = 0) float dp) {
+            @FloatRange(from = 0f) float dp) {
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
                 context.getResources().getDisplayMetrics());
     }
 
     @CheckResult
     public static float spToPx(@NonNull Context context,
-            @IntRange(from = 0) float sp) {
+            @FloatRange(from = 0f) float sp) {
         return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, sp,
                 context.getResources().getDisplayMetrics());
     }

android-iconify/src/main/java/com/joanzapata/iconify/widget/IconButton.java

@@ -5,6 +5,7 @@
 import android.widget.Button;
 import com.joanzapata.iconify.Iconify;
 
+@SuppressWarnings("AppCompatCustomView")
 public class IconButton extends Button {
 
     public IconButton(Context context) {

android-iconify/src/main/java/com/joanzapata/iconify/widget/IconImageButton.java

@@ -16,6 +16,7 @@
 import com.joanzapata.iconify.R;
 import com.joanzapata.iconify.internal.Animation;
 
+@SuppressWarnings("AppCompatCustomView")
 public class IconImageButton extends ImageButton {
 
     @NonNull

android-iconify/src/main/java/com/joanzapata/iconify/widget/IconImageView.java

@@ -17,6 +17,7 @@
 import com.joanzapata.iconify.R;
 import com.joanzapata.iconify.internal.Animation;
 
+@SuppressWarnings("AppCompatCustomView")
 public class IconImageView extends ImageView {
 
     static final int DEFAULT_COLOR = Color.BLACK;

android-iconify/src/main/java/com/joanzapata/iconify/widget/IconTextView.java

@@ -5,6 +5,7 @@
 import android.widget.TextView;
 import com.joanzapata.iconify.Iconify;
 
+@SuppressWarnings("AppCompatCustomView")
 public class IconTextView extends TextView {
 
     public IconTextView(Context context) {

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()  //  This is the Maven Central repo
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.3.0'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }

buildSrc/build.gradle

@@ -22,7 +22,7 @@ subprojects {
         // get picked up. We only have one buildSrc plugin
         // so it doesn't really matter, but if we ever get more
         // we should figure this out
-        compile 'org.codehaus.groovy:groovy-all:2.4.4'
+        compile 'org.codehaus.groovy:groovy-all:2.4.7'
         compile gradleApi()
         compile 'org.yaml:snakeyaml:1.14'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Oct 25 01:08:15 PKT 2016
+#Fri Mar 31 16:11:06 PKT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip