Migrate do AndroidX.

gradle.properties

@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

mobile/build.gradle

@@ -12,7 +12,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "3.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -26,10 +26,10 @@ android {
 dependencies {
     implementation project(path: ':williamchart')
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

mobile/src/main/java/com/db/williamchartdemo/BarChartFragment.kt

@@ -1,10 +1,10 @@
 package com.db.williamchartdemo
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import com.db.williamchart.data.BarSet
 import com.db.williamchart.data.Point
 import kotlinx.android.synthetic.main.barchart_frag.*

mobile/src/main/java/com/db/williamchartdemo/LineChartFragment.kt

@@ -2,10 +2,10 @@ package com.db.williamchartdemo
 
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import com.db.williamchart.data.Line
 import com.db.williamchart.data.Point
 import kotlinx.android.synthetic.main.linechart_frag.*

mobile/src/main/java/com/db/williamchartdemo/MainActivity.kt

@@ -1,8 +1,8 @@
 package com.db.williamchartdemo
 
 import android.os.Bundle
-import android.support.design.widget.BottomNavigationView
-import android.support.v7.app.AppCompatActivity
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {

mobile/src/main/res/layout/activity_main.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,9 +15,9 @@
         app:layout_constraintBottom_toTopOf="@id/navigation"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"/>
 
-    <android.support.design.widget.BottomNavigationView
+    <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/navigation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -26,6 +27,6 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/navigation" />
+        app:menu="@menu/navigation"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

williamchart/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -26,12 +26,12 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.mockito:mockito-core:2.19.0"
     testImplementation "com.nhaarman:mockito-kotlin:1.6.0"
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41"
 }
 

williamchart/src/main/java/com/db/williamchart/data/BarSet.kt

@@ -1,6 +1,6 @@
 package com.db.williamchart.data
 
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
 
 data class BarSet(
     override val entries: MutableList<ChartEntry> = mutableListOf(),

williamchart/src/main/java/com/db/williamchart/data/Line.kt

@@ -1,15 +1,16 @@
 package com.db.williamchart.data
 
-import android.support.annotation.ColorInt
-import android.support.annotation.Size
+import androidx.annotation.ColorInt
+import androidx.annotation.Size
 
 data class Line(
     override val entries: MutableList<ChartEntry> = mutableListOf(),
     @ColorInt override var color: Int = -0x1000000, // Black as default
     var smooth: Boolean = false,
     var strokeWidth: Float = 4F,
     var fillColor: Int = 0,
-    @Size(min = 2, max = 2) var gradientFillColors: IntArray = intArrayOf()) : ChartSet {
+    @Size(min = 2, max = 2) var gradientFillColors: IntArray = intArrayOf(0, 0)
+) : ChartSet {
 
     override fun add(entry: ChartEntry) {
         entries.add(entry)

williamchart/src/main/java/com/db/williamchart/view/ChartView.kt

@@ -4,11 +4,11 @@ import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.Canvas
 import android.graphics.Typeface
-import android.support.v4.content.res.ResourcesCompat
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.ViewTreeObserver
 import android.widget.RelativeLayout
+import androidx.core.content.res.ResourcesCompat
 import com.db.williamchart.ChartContract
 import com.db.williamchart.Painter
 import com.db.williamchart.R