Merge pull request #141 from flipkart-incubator/migrate-to-android-x

Migrate to androidx

Author: adityasharat

build.gradle

@@ -24,7 +24,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }
 }
@@ -40,11 +40,13 @@ allprojects {
 
 ext {
     groupName = 'com.github.flipkart-incubator.proteus'
-    versionName = '5.0.0-snapshot'
-    versionCode = 500014
+    versionName = '5.0.0-rc15'
+    versionCode = 500015
     compileSdkVersion = 28
     minSdkVersion = 19
     targetSdkVersion = 28
     buildToolsVersion = '28.0.3'
-    supportLibraryVersion = '28.0.0'
+    supportLibraryVersion = '1.0.2'
 }
+
+apply plugin: 'maven-publish'

cardview-v7/build.gradle

@@ -47,8 +47,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation "com.android.support:cardview-v7:${rootProject.ext.supportLibraryVersion}"
-    api "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"
+    implementation "androidx.cardview:cardview:1.0.0"
+    api "androidx.appcompat:appcompat:${rootProject.ext.supportLibraryVersion}"
     api project(path: ':proteus-core')
 
     androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {

cardview-v7/src/main/java/com/flipkart/android/proteus/support/v7/widget/CardViewParser.java

@@ -17,9 +17,6 @@
 package com.flipkart.android.proteus.support.v7.widget;
 
 import android.content.res.ColorStateList;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.CardView;
 import android.view.ViewGroup;
 
 import com.flipkart.android.proteus.ProteusContext;
@@ -31,6 +28,10 @@
 import com.flipkart.android.proteus.value.Layout;
 import com.flipkart.android.proteus.value.ObjectValue;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
+
 /**
  * CardViewParser
  *

cardview-v7/src/main/java/com/flipkart/android/proteus/support/v7/widget/ProteusCardView.java

@@ -16,13 +16,14 @@
 
 package com.flipkart.android.proteus.support.v7.widget;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.CardView;
 import android.view.View;
 
 import com.flipkart.android.proteus.ProteusContext;
 import com.flipkart.android.proteus.ProteusView;
 
+import androidx.annotation.NonNull;
+import androidx.cardview.widget.CardView;
+
 /**
  * ProteusCardView
  *

data/layouts.json

@@ -53,11 +53,11 @@
           },
           {
             "type": "ImageView",
-            "src": "https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png",
+            "src": "https://www.google.com/images/branding/googlelogo/2x/googlelogo_color_272x92dp.png",
             "layout_height": "70dp",
             "layout_width": "120dp",
             "padding": "4dp",
-            "background": "@color/colorPrimary",
+            "background": "#000000",
             "scaleType": "fitCenter",
             "layout_alignParentTop": true,
             "layout_alignParentRight": true

demo/build.gradle

@@ -63,16 +63,13 @@ android {
     dependencies {
         implementation fileTree(include: ['*.jar'], dir: 'libs')
 
-        implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibraryVersion}"
-        implementation "com.android.support:design:${rootProject.ext.supportLibraryVersion}"
-        implementation 'com.github.tony19:logback-android-core:1.1.1-3'
-        implementation 'com.github.tony19:logback-android-classic:1.1.1-3'
-        implementation 'com.squareup.retrofit2:retrofit:2.1.0'
-        implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
-        implementation('com.github.bumptech.glide:glide:4.7.1') {
-            exclude group: "com.android.support"
-        }
-        annotationProcessor 'com.github.bumptech.glide:compiler:4.7.1'
+        implementation "androidx.appcompat:appcompat:${rootProject.ext.supportLibraryVersion}"
+        implementation "com.google.android.material:material:1.0.0"
+        implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+        implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+        implementation 'com.github.bumptech.glide:glide:4.9.0'
+        annotationProcessor "androidx.annotation:annotation:${rootProject.ext.supportLibraryVersion}"
+        annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
 
         implementation project(':proteus-core')
         implementation project(':gson-adapter')

demo/src/main/java/com/flipkart/android/proteus/demo/CircleViewParser.java

@@ -16,8 +16,6 @@
 
 package com.flipkart.android.proteus.demo;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 
 import com.flipkart.android.proteus.ProteusContext;
@@ -28,6 +26,9 @@
 import com.flipkart.android.proteus.value.Layout;
 import com.flipkart.android.proteus.value.ObjectValue;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 /**
  * CircleViewParser
  *

demo/src/main/java/com/flipkart/android/proteus/demo/ProteusActivity.java

@@ -18,12 +18,6 @@
 
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -45,9 +39,16 @@
 import com.flipkart.android.proteus.value.Layout;
 import com.flipkart.android.proteus.value.ObjectValue;
 import com.flipkart.android.proteus.value.Value;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
 public class ProteusActivity extends AppCompatActivity implements ProteusManager.Listener {
 
   private ProteusManager proteusManager;

demo/src/main/java/com/flipkart/android/proteus/demo/api/ProteusManager.java

@@ -17,8 +17,6 @@
 package com.flipkart.android.proteus.demo.api;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
 import com.flipkart.android.proteus.Proteus;
@@ -37,6 +35,8 @@
 import java.util.Map;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import retrofit2.Retrofit;
 
 public class ProteusManager {

demo/src/main/java/com/flipkart/android/proteus/demo/customviews/CircleView.java

@@ -22,13 +22,14 @@
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.Build;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewTreeObserver;
 
 import com.flipkart.android.proteus.ProteusView;
 
+import androidx.annotation.NonNull;
+
 /**
  * CircleView
  *