Migrate to androidx

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.31'
+    ext.kotlin_version = '1.3.10'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
 

gradle.properties

@@ -9,6 +9,8 @@
 
 # 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.

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

sample/build.gradle

@@ -3,11 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     defaultConfig {
         applicationId "com.transferwise.sequencelayout.sample"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }
@@ -20,7 +20,8 @@ android {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.0'
     implementation project(':sequencelayout')
+
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.0.2'
 }

sample/src/main/java/com/transferwise/sequencelayout/sample/MainActivity.kt

@@ -1,7 +1,7 @@
 package com.transferwise.sequencelayout.sample
 
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 
 
 class MainActivity : AppCompatActivity() {

sample/src/main/res/layout/switch_item.xml

@@ -1,4 +1,4 @@
-<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_alignParentEnd="true"

sequencelayout/build.gradle

@@ -6,13 +6,13 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.transferwise'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 27
-        versionCode 7
-        versionName "1.0.7"
+        targetSdkVersion 28
+        versionCode 8
+        versionName "1.0.8"
         archivesBaseName = "com.transferwise.sequencelayout-${versionName}"
     }
 
@@ -26,5 +26,5 @@ android {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.0'
-}
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+}

sequencelayout/src/main/java/com/transferwise/sequencelayout/SequenceLayout.kt

@@ -3,8 +3,8 @@ package com.transferwise.sequencelayout
 import android.content.Context
 import android.content.res.TypedArray
 import android.graphics.Rect
-import android.support.annotation.ColorInt
-import android.support.annotation.StyleRes
+import androidx.annotation.ColorInt
+import androidx.annotation.StyleRes
 import android.util.AttributeSet
 import android.view.Gravity
 import android.view.View

sequencelayout/src/main/java/com/transferwise/sequencelayout/SequenceStep.kt

@@ -2,9 +2,9 @@ package com.transferwise.sequencelayout
 
 import android.content.Context
 import android.content.res.TypedArray
-import android.support.annotation.StringRes
-import android.support.annotation.StyleRes
-import android.support.v4.widget.TextViewCompat
+import androidx.annotation.StringRes
+import androidx.annotation.StyleRes
+import androidx.core.widget.TextViewCompat
 import android.util.AttributeSet
 import android.view.View
 import android.widget.TableRow

sequencelayout/src/main/java/com/transferwise/sequencelayout/SequenceStepDot.kt

@@ -9,7 +9,7 @@ import android.graphics.Color
 import android.graphics.drawable.GradientDrawable
 import android.graphics.drawable.GradientDrawable.OVAL
 import android.graphics.drawable.StateListDrawable
-import android.support.annotation.ColorInt
+import androidx.annotation.ColorInt
 import android.util.AttributeSet
 import android.view.View
 import android.widget.FrameLayout