diff --git a/build.gradle b/build.gradle
index f6f82340..4a44e61b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
       classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
       classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
       classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.0.0'
-      classpath 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.8'
+      classpath 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.16'
     }
   }
 }
@@ -35,9 +35,9 @@ subprojects {
 }
 
 ext {
-  minSdkVersion = 9
-  targetSdkVersion = 27
-  compileSdkVersion = 27
+  minSdkVersion = 14
+  targetSdkVersion = 28
+  compileSdkVersion = 28
   buildToolsVersion = '28.0.3'
   sourceCompatibilityVersion = JavaVersion.VERSION_1_7
   targetCompatibilityVersion = JavaVersion.VERSION_1_7
@@ -56,29 +56,28 @@ project.plugins.whenPluginAdded { plugin ->
   }
 }
 
-def androidSupportVersion = '27.0.1'
+def androidxVersion = '1.0.0-beta01'
 def gradleIncapHelperVersion = '0.2'
 def autoserviceVersion = '1.0-rc5'
 
 ext.deps = [
-        android                   : 'com.google.android:android:4.1.1.4',
-        supportAnnotations        : "com.android.support:support-annotations:$androidSupportVersion",
-        appCompat                 : "com.android.support:appcompat-v7:$androidSupportVersion",
-        design                    : "com.android.support:design:$androidSupportVersion",
-        supportTestRunner         : 'com.android.support.test:runner:0.5',
-        javapoet                  : 'com.squareup:javapoet:1.8.0',
-        autovalueProcessor        : 'com.google.auto.value:auto-value:1.6.5',
-        autovalueApi              : 'com.google.auto.value:auto-value-annotations:1.6.3',
-        autocommon                : 'com.google.auto:auto-common:0.8',
-        autoserviceProcessor      : "com.google.auto.service:auto-service:$autoserviceVersion",
-        autoserviceApi            : "com.google.auto.service:auto-service-annotations:$autoserviceVersion",
-        javaFormat                : 'com.google.googlejavaformat:google-java-format:1.1',
-        junit                     : 'junit:junit:4.12',
-        truth                     : 'com.google.truth:truth:0.30',
-        compiletesting            : 'com.google.testing.compile:compile-testing:0.10',
-        lombok                    : "org.projectlombok:lombok:1.16.16",
-        gradleIncapHelperApi      : "net.ltgt.gradle.incap:incap:$gradleIncapHelperVersion",
-        gradleIncapHelperProcessor: "net.ltgt.gradle.incap:incap-processor:$gradleIncapHelperVersion"
+    android: 'com.google.android:android:4.1.1.4',
+    supportAnnotations: "androidx.annotation:annotation:$androidxVersion",
+    appCompat: "androidx.appcompat:appcompat:$androidxVersion",
+    supportTestRunner: 'com.android.support.test:runner:0.5',
+    javapoet: 'com.squareup:javapoet:1.8.0',
+    autovalueProcessor: 'com.google.auto.value:auto-value:1.6.5',
+    autovalueApi: 'com.google.auto.value:auto-value-annotations:1.6.3',
+    autocommon: 'com.google.auto:auto-common:0.8',
+    autoserviceProcessor: "com.google.auto.service:auto-service:$autoserviceVersion",
+    autoserviceApi: "com.google.auto.service:auto-service-annotations:$autoserviceVersion",
+    javaFormat: 'com.google.googlejavaformat:google-java-format:1.1',
+    junit: 'junit:junit:4.12',
+    truth: 'com.google.truth:truth:0.30',
+    compiletesting: 'com.google.testing.compile:compile-testing:0.10',
+    lombok: "org.projectlombok:lombok:1.16.16",
+    gradleIncapHelperApi: "net.ltgt.gradle.incap:incap:$gradleIncapHelperVersion",
+    gradleIncapHelperProcessor: "net.ltgt.gradle.incap:incap-processor:$gradleIncapHelperVersion"
 ]
 
 task clean(type: Delete) {
diff --git a/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/DateAdapter.java b/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/DateAdapter.java
index d0f55c3b..6e102c62 100644
--- a/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/DateAdapter.java
+++ b/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/DateAdapter.java
@@ -17,8 +17,10 @@
 package nz.bradcampbell.autovalueexample;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.util.Date;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 public final class DateAdapter implements TypeAdapter<Date> {
diff --git a/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/MainActivity.java b/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/MainActivity.java
index f93227be..648ef74c 100644
--- a/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/MainActivity.java
+++ b/examples/autovalue-example/src/main/java/nz/bradcampbell/autovalueexample/MainActivity.java
@@ -17,16 +17,18 @@
 package nz.bradcampbell.autovalueexample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import androidx.annotation.Nullable;
+
 public class MainActivity extends AppCompatActivity {
   private static final String STATE_KEY = "state";
 
diff --git a/examples/java7-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java b/examples/java7-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java
index d71f1324..3b1ddfad 100644
--- a/examples/java7-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java
+++ b/examples/java7-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java
@@ -17,8 +17,10 @@
 package nz.bradcampbell.java7example;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.util.Date;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 public final class DateAdapter implements TypeAdapter<Date> {
diff --git a/examples/java7-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java b/examples/java7-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java
index e8d74aa0..e63578ef 100644
--- a/examples/java7-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java
+++ b/examples/java7-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java
@@ -17,16 +17,18 @@
 package nz.bradcampbell.java7example;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import androidx.annotation.Nullable;
+
 public class MainActivity extends AppCompatActivity {
   private State state = new State(0);
   private final DateFormat dateFormat = new SimpleDateFormat("HH:mm", Locale.getDefault());
diff --git a/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java b/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java
index d71f1324..3b1ddfad 100644
--- a/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java
+++ b/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/DateAdapter.java
@@ -17,8 +17,10 @@
 package nz.bradcampbell.java7example;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.util.Date;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 public final class DateAdapter implements TypeAdapter<Date> {
diff --git a/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java b/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java
index 269259f7..463a4b37 100644
--- a/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java
+++ b/examples/java7-lombok-example/src/main/java/nz/bradcampbell/java7example/MainActivity.java
@@ -17,16 +17,18 @@
 package nz.bradcampbell.java7example;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.TextView;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
 
+import androidx.annotation.Nullable;
+
 public class MainActivity extends AppCompatActivity {
   private State state = new State(0);
   private final DateFormat dateFormat = new SimpleDateFormat("HH:mm", Locale.getDefault());
diff --git a/examples/kotlin-example/build.gradle b/examples/kotlin-example/build.gradle
index f8a4c47f..08519746 100644
--- a/examples/kotlin-example/build.gradle
+++ b/examples/kotlin-example/build.gradle
@@ -34,17 +34,16 @@ android {
 }
 
 dependencies {
-  compile deps.appCompat
-  compile deps.design
+  implementation deps.appCompat
 
-  compile project(':paperparcel')
-  compile project(':paperparcel-kotlin')
+  implementation project(':paperparcel')
+  implementation project(':paperparcel-kotlin')
   kapt project(':paperparcel-compiler')
 
-  compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-  testCompile deps.junit
-  testCompile deps.compiletesting
+  testImplementation deps.junit
+  testImplementation deps.compiletesting
 }
 
 tasks.withType(Test) {
diff --git a/examples/kotlin-example/src/main/AndroidManifest.xml b/examples/kotlin-example/src/main/AndroidManifest.xml
index db102c8a..5a04972b 100644
--- a/examples/kotlin-example/src/main/AndroidManifest.xml
+++ b/examples/kotlin-example/src/main/AndroidManifest.xml
@@ -9,13 +9,12 @@
       android:icon="@mipmap/ic_launcher"
       android:label="@string/app_name"
       android:supportsRtl="true"
-      android:theme="@style/AppTheme"
       tools:ignore="GoogleAppIndexingWarning,UnusedAttribute">
 
     <activity
         android:name=".MainActivity"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme.NoActionBar">
+        android:theme="@style/AppTheme">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
 
diff --git a/examples/kotlin-example/src/main/kotlin/nz/bradcampbell/kotlinexample/MainActivity.kt b/examples/kotlin-example/src/main/kotlin/nz/bradcampbell/kotlinexample/MainActivity.kt
index 46688559..1a8eaa71 100644
--- a/examples/kotlin-example/src/main/kotlin/nz/bradcampbell/kotlinexample/MainActivity.kt
+++ b/examples/kotlin-example/src/main/kotlin/nz/bradcampbell/kotlinexample/MainActivity.kt
@@ -16,51 +16,54 @@
 
 package nz.bradcampbell.kotlinexample
 
+import android.annotation.SuppressLint
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
+import android.view.View
 import android.widget.TextView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
 import java.text.SimpleDateFormat
 import java.util.Date
+import java.util.Locale
 
 class MainActivity : AppCompatActivity() {
-  var state = State(0, Date())
-  val dateFormat = SimpleDateFormat("HH:mm")
+  private var state = State(0, Date())
+  private val dateFormat = SimpleDateFormat("HH:mm", Locale.ENGLISH)
 
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.activity_main)
 
     savedInstanceState?.let {
-      state = it.getParcelable<State>("state")
+      state = it.getParcelable("state")
     }
 
-    val toolbar = findViewById(R.id.toolbar) as Toolbar
+    val toolbar = findViewById<Toolbar>(R.id.toolbar)
     setSupportActionBar(toolbar)
 
-    val plusButton = findViewById(R.id.add_button)
+    val plusButton = findViewById<View>(R.id.add_button)
     plusButton.setOnClickListener {
-      state = state.copy(state.count + 1, Date())
+      state = state.copy(count = state.count + 1, modificationDate =  Date())
       updateText()
     }
 
-    val subtractButton = findViewById(R.id.subtract_button)
+    val subtractButton = findViewById<View>(R.id.subtract_button)
     subtractButton.setOnClickListener {
-      state = state.copy(state.count - 1, Date())
+      state = state.copy(count = state.count - 1, modificationDate = Date())
       updateText()
     }
 
     updateText()
   }
 
-  fun updateText() {
-    val counter = findViewById(R.id.counter) as TextView
-    counter.text = state.count.toString() + " (updated at " + dateFormat.format(
-        state.modificationDate) + ")"
-  }
-
   override fun onSaveInstanceState(outState: Bundle) {
     super.onSaveInstanceState(outState)
     outState.putParcelable("state", state)
   }
+
+  @SuppressLint("SetTextI18n")
+  private fun updateText() {
+    val counter = findViewById<TextView>(R.id.counter)
+    counter.text = "${state.count} (updated at ${dateFormat.format(state.modificationDate)})"
+  }
 }
diff --git a/examples/kotlin-example/src/main/res/layout/activity_main.xml b/examples/kotlin-example/src/main/res/layout/activity_main.xml
index 097ded18..1680016b 100644
--- a/examples/kotlin-example/src/main/res/layout/activity_main.xml
+++ b/examples/kotlin-example/src/main/res/layout/activity_main.xml
@@ -1,30 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<LinearLayout
     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"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
+    android:orientation="vertical"
     tools:context=".MainActivity"
+    tools:showIn="@layout/activity_main"
     >
 
-  <android.support.design.widget.AppBarLayout
+  <androidx.appcompat.widget.Toolbar
+      android:id="@+id/toolbar"
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:theme="@style/AppTheme.AppBarOverlay"
+      android:layout_height="?attr/actionBarSize"
+      android:background="?attr/colorPrimary"
+      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+      />
+
+  <LinearLayout
+      android:layout_width="wrap_content"
+      android:layout_height="match_parent"
+      android:orientation="horizontal"
+      android:paddingLeft="@dimen/activity_horizontal_margin"
+      android:paddingTop="@dimen/activity_vertical_margin"
+      android:paddingRight="@dimen/activity_horizontal_margin"
+      android:paddingBottom="@dimen/activity_vertical_margin"
       >
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        app:popupTheme="@style/AppTheme.PopupOverlay"
+    <TextView
+        android:id="@+id/counter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="0"
+        />
+
+    <View
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1"
         />
 
-  </android.support.design.widget.AppBarLayout>
+    <Button
+        android:id="@+id/subtract_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/subtract_button"
+        />
+
+    <Button
+        android:id="@+id/add_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/add_button"
+        />
 
-  <include layout="@layout/content_main"/>
+  </LinearLayout>
 
-</android.support.design.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/examples/kotlin-example/src/main/res/layout/content_main.xml b/examples/kotlin-example/src/main/res/layout/content_main.xml
deleted file mode 100644
index de45a527..00000000
--- a/examples/kotlin-example/src/main/res/layout/content_main.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity"
-    tools:showIn="@layout/activity_main"
-    >
-
-  <TextView
-      android:id="@+id/counter"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      tools:text="0"
-      />
-
-  <View
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      android:layout_weight="1"
-      />
-
-  <Button
-      android:id="@+id/subtract_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/subtract_button"
-      />
-
-  <Button
-      android:id="@+id/add_button"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:text="@string/add_button"
-      />
-
-</LinearLayout>
diff --git a/examples/kotlin-example/src/main/res/values-v21/styles.xml b/examples/kotlin-example/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 840e61ba..00000000
--- a/examples/kotlin-example/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>>
-
-  <style name="AppTheme.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-    <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-    <item name="android:statusBarColor">@android:color/transparent</item>
-  </style>
-</resources>
diff --git a/examples/kotlin-example/src/main/res/values/styles.xml b/examples/kotlin-example/src/main/res/values/styles.xml
index b1c33cc9..dfbfaec9 100644
--- a/examples/kotlin-example/src/main/res/values/styles.xml
+++ b/examples/kotlin-example/src/main/res/values/styles.xml
@@ -1,20 +1,11 @@
 <resources>
 
   <!-- Base application theme. -->
-  <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+  <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
     <!-- Customize your theme here. -->
     <item name="colorPrimary">@color/colorPrimary</item>
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     <item name="colorAccent">@color/colorAccent</item>
   </style>
 
-  <style name="AppTheme.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-  <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
-
-  <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
-
 </resources>
diff --git a/examples/realm-example/src/main/java/nz/bradcampbell/realmexample/RealmListTypeAdapter.java b/examples/realm-example/src/main/java/nz/bradcampbell/realmexample/RealmListTypeAdapter.java
index 00619414..2bdb276b 100644
--- a/examples/realm-example/src/main/java/nz/bradcampbell/realmexample/RealmListTypeAdapter.java
+++ b/examples/realm-example/src/main/java/nz/bradcampbell/realmexample/RealmListTypeAdapter.java
@@ -17,7 +17,8 @@
 package nz.bradcampbell.realmexample;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 import io.realm.RealmList;
 import io.realm.RealmModel;
 import paperparcel.TypeAdapter;
diff --git a/gradle.properties b/gradle.properties
index 6a0343c6..52d10712 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -15,3 +15,6 @@ POM_LICENCE_DIST=repo
 
 POM_DEVELOPER_ID=granstaish
 POM_DEVELOPER_NAME=Brad Campbell
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/paperparcel-api/src/main/java/paperparcel/TypeAdapter.java b/paperparcel-api/src/main/java/paperparcel/TypeAdapter.java
index 61e963b0..b0406ce3 100644
--- a/paperparcel-api/src/main/java/paperparcel/TypeAdapter.java
+++ b/paperparcel-api/src/main/java/paperparcel/TypeAdapter.java
@@ -17,7 +17,8 @@
 package paperparcel;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 /**
  * <p>A custom method for reading and writing a type using {@link Parcel}.</p>
diff --git a/paperparcel-compiler/src/main/java/paperparcel/AdapterDescriptor.java b/paperparcel-compiler/src/main/java/paperparcel/AdapterDescriptor.java
index d1d5cd54..b3c5b611 100644
--- a/paperparcel-compiler/src/main/java/paperparcel/AdapterDescriptor.java
+++ b/paperparcel-compiler/src/main/java/paperparcel/AdapterDescriptor.java
@@ -16,7 +16,6 @@
 
 package paperparcel;
 
-import android.support.annotation.Nullable;
 import com.google.auto.common.MoreTypes;
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Optional;
@@ -24,9 +23,11 @@
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
@@ -39,6 +40,8 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
+import androidx.annotation.Nullable;
+
 /**
  * Describes the TypeAdapter required for a particular field, and all of its
  * dependencies. Instances of {@code AdapterDescriptor} are cached across processing rounds, so must
diff --git a/paperparcel-compiler/src/main/java/paperparcel/OptionsDescriptor.java b/paperparcel-compiler/src/main/java/paperparcel/OptionsDescriptor.java
index 5ec375a2..270d471a 100644
--- a/paperparcel-compiler/src/main/java/paperparcel/OptionsDescriptor.java
+++ b/paperparcel-compiler/src/main/java/paperparcel/OptionsDescriptor.java
@@ -16,14 +16,17 @@
 
 package paperparcel;
 
-import android.support.annotation.Nullable;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
+
 import java.util.Set;
+
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Modifier;
 
+import androidx.annotation.Nullable;
+
 import static javax.lang.model.element.Modifier.STATIC;
 import static javax.lang.model.element.Modifier.TRANSIENT;
 
diff --git a/paperparcel-compiler/src/main/java/paperparcel/PaperParcelAutoValueExtensionValidator.java b/paperparcel-compiler/src/main/java/paperparcel/PaperParcelAutoValueExtensionValidator.java
index a9a579dc..51d90f37 100644
--- a/paperparcel-compiler/src/main/java/paperparcel/PaperParcelAutoValueExtensionValidator.java
+++ b/paperparcel-compiler/src/main/java/paperparcel/PaperParcelAutoValueExtensionValidator.java
@@ -16,11 +16,12 @@
 
 package paperparcel;
 
-import android.support.annotation.Nullable;
 import com.google.auto.common.MoreElements;
 import com.google.auto.common.MoreTypes;
 import com.google.common.collect.ImmutableSet;
+
 import java.util.List;
+
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Modifier;
 import javax.lang.model.element.TypeElement;
@@ -29,6 +30,8 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
 
+import androidx.annotation.Nullable;
+
 final class PaperParcelAutoValueExtensionValidator {
   private final Elements elements;
   private final Types types;
diff --git a/paperparcel-compiler/src/main/java/paperparcel/PaperParcelWriter.java b/paperparcel-compiler/src/main/java/paperparcel/PaperParcelWriter.java
index ed43c120..7daa7cf7 100644
--- a/paperparcel-compiler/src/main/java/paperparcel/PaperParcelWriter.java
+++ b/paperparcel-compiler/src/main/java/paperparcel/PaperParcelWriter.java
@@ -16,7 +16,6 @@
 
 package paperparcel;
 
-import android.support.annotation.NonNull;
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
@@ -34,14 +33,18 @@
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
 import com.squareup.javapoet.TypeSpec;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.Name;
 import javax.lang.model.type.TypeMirror;
+
+import androidx.annotation.NonNull;
 import paperparcel.AdapterDescriptor.ConstructorInfo;
 
 import static javax.lang.model.element.Modifier.FINAL;
diff --git a/paperparcel-compiler/src/main/java/paperparcel/TypeKey.java b/paperparcel-compiler/src/main/java/paperparcel/TypeKey.java
index 74b0134c..0607529b 100644
--- a/paperparcel-compiler/src/main/java/paperparcel/TypeKey.java
+++ b/paperparcel-compiler/src/main/java/paperparcel/TypeKey.java
@@ -16,13 +16,14 @@
 
 package paperparcel;
 
-import android.support.annotation.Nullable;
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableList;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import javax.lang.model.element.TypeElement;
 import javax.lang.model.element.TypeParameterElement;
 import javax.lang.model.type.ArrayType;
@@ -34,6 +35,8 @@
 import javax.lang.model.util.SimpleTypeVisitor6;
 import javax.lang.model.util.Types;
 
+import androidx.annotation.Nullable;
+
 @SuppressWarnings("StaticInitializerReferencesSubClass")
 abstract class TypeKey {
   private static final ClassKey OBJECT = ClassKey.get("java.lang.Object");
diff --git a/paperparcel-compiler/src/main/java/paperparcel/Utils.java b/paperparcel-compiler/src/main/java/paperparcel/Utils.java
index 4b01001b..b27dd28b 100644
--- a/paperparcel-compiler/src/main/java/paperparcel/Utils.java
+++ b/paperparcel-compiler/src/main/java/paperparcel/Utils.java
@@ -16,7 +16,6 @@
 
 package paperparcel;
 
-import android.support.annotation.Nullable;
 import com.google.auto.common.AnnotationMirrors;
 import com.google.auto.common.MoreElements;
 import com.google.auto.common.MoreTypes;
@@ -28,12 +27,14 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Ordering;
 import com.google.common.primitives.Ints;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.AnnotationValueVisitor;
@@ -57,6 +58,8 @@
 import javax.lang.model.util.SimpleTypeVisitor6;
 import javax.lang.model.util.Types;
 
+import androidx.annotation.Nullable;
+
 import static com.google.auto.common.MoreElements.asType;
 import static com.google.auto.common.MoreTypes.asDeclared;
 import static com.google.common.base.Preconditions.checkState;
@@ -266,7 +269,8 @@ private static TypeMirror paramAsMemberOf(
     return resolved;
   }
 
-  @Nullable private static TypeMirror paramAsMemberOfImpl(
+  @Nullable
+  private static TypeMirror paramAsMemberOfImpl(
       Types types, DeclaredType type, TypeParameterElement param) {
     TypeElement paramEnclosingElement = (TypeElement) param.getEnclosingElement();
     TypeElement typeAsElement = (TypeElement) type.asElement();
diff --git a/paperparcel/build.gradle b/paperparcel/build.gradle
index a94c03ab..b4480fd8 100644
--- a/paperparcel/build.gradle
+++ b/paperparcel/build.gradle
@@ -11,7 +11,7 @@ android {
 
     consumerProguardFiles 'proguard-rules.txt'
 
-    testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
+    testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
   }
 
   compileOptions {
diff --git a/paperparcel/src/main/java/paperparcel/internal/ArrayAdapter.java b/paperparcel/src/main/java/paperparcel/internal/ArrayAdapter.java
index 3cc88258..eafda512 100644
--- a/paperparcel/src/main/java/paperparcel/internal/ArrayAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/ArrayAdapter.java
@@ -17,8 +17,10 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.lang.reflect.Array;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/CollectionAdapter.java b/paperparcel/src/main/java/paperparcel/internal/CollectionAdapter.java
index b7d3781b..aee9b30e 100644
--- a/paperparcel/src/main/java/paperparcel/internal/CollectionAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/CollectionAdapter.java
@@ -17,9 +17,11 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.Collection;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/EnumAdapter.java b/paperparcel/src/main/java/paperparcel/internal/EnumAdapter.java
index 1df58796..929586c9 100644
--- a/paperparcel/src/main/java/paperparcel/internal/EnumAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/EnumAdapter.java
@@ -17,7 +17,8 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/ListAdapter.java b/paperparcel/src/main/java/paperparcel/internal/ListAdapter.java
index 77ac3b4e..fe6341cb 100644
--- a/paperparcel/src/main/java/paperparcel/internal/ListAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/ListAdapter.java
@@ -17,9 +17,11 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.util.ArrayList;
 import java.util.List;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/MapAdapter.java b/paperparcel/src/main/java/paperparcel/internal/MapAdapter.java
index 4dc23aad..73120138 100644
--- a/paperparcel/src/main/java/paperparcel/internal/MapAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/MapAdapter.java
@@ -17,9 +17,11 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.util.LinkedHashMap;
 import java.util.Map;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/ParcelableAdapter.java b/paperparcel/src/main/java/paperparcel/internal/ParcelableAdapter.java
index 3af0c1ef..dad77fe0 100644
--- a/paperparcel/src/main/java/paperparcel/internal/ParcelableAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/ParcelableAdapter.java
@@ -18,8 +18,9 @@
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/SerializableAdapter.java b/paperparcel/src/main/java/paperparcel/internal/SerializableAdapter.java
index d4615da4..d136d639 100644
--- a/paperparcel/src/main/java/paperparcel/internal/SerializableAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/SerializableAdapter.java
@@ -17,9 +17,11 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
 import java.io.Serializable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused", "unchecked" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/SetAdapter.java b/paperparcel/src/main/java/paperparcel/internal/SetAdapter.java
index dd59cbe2..c643f2fd 100644
--- a/paperparcel/src/main/java/paperparcel/internal/SetAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/SetAdapter.java
@@ -17,9 +17,11 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+
 import java.util.LinkedHashSet;
 import java.util.Set;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/SparseArrayAdapter.java b/paperparcel/src/main/java/paperparcel/internal/SparseArrayAdapter.java
index 04be7dc3..4132eef7 100644
--- a/paperparcel/src/main/java/paperparcel/internal/SparseArrayAdapter.java
+++ b/paperparcel/src/main/java/paperparcel/internal/SparseArrayAdapter.java
@@ -17,8 +17,9 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
 import android.util.SparseArray;
+
+import androidx.annotation.NonNull;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/StaticAdapters.java b/paperparcel/src/main/java/paperparcel/internal/StaticAdapters.java
index bb72a4c4..1885e610 100644
--- a/paperparcel/src/main/java/paperparcel/internal/StaticAdapters.java
+++ b/paperparcel/src/main/java/paperparcel/internal/StaticAdapters.java
@@ -6,12 +6,13 @@
 import android.os.IBinder;
 import android.os.Parcel;
 import android.os.PersistableBundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Size;
 import android.util.SizeF;
 import android.util.SparseBooleanArray;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/main/java/paperparcel/internal/Utils.java b/paperparcel/src/main/java/paperparcel/internal/Utils.java
index 76037d2b..a8f3bd8e 100644
--- a/paperparcel/src/main/java/paperparcel/internal/Utils.java
+++ b/paperparcel/src/main/java/paperparcel/internal/Utils.java
@@ -17,11 +17,13 @@
 package paperparcel.internal;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import paperparcel.TypeAdapter;
 
 @SuppressWarnings({ "WeakerAccess", "unused" }) // Used by generated code
diff --git a/paperparcel/src/test/java/paperparcel/PaperParcelAutoValueExtensionTest.java b/paperparcel/src/test/java/paperparcel/PaperParcelAutoValueExtensionTest.java
index 110c0d79..a9f0ed8f 100644
--- a/paperparcel/src/test/java/paperparcel/PaperParcelAutoValueExtensionTest.java
+++ b/paperparcel/src/test/java/paperparcel/PaperParcelAutoValueExtensionTest.java
@@ -3,9 +3,12 @@
 import com.google.auto.value.processor.AutoValueProcessor;
 import com.google.common.base.Joiner;
 import com.google.testing.compile.JavaFileObjects;
+
+import org.junit.Test;
+
 import java.util.Arrays;
+
 import javax.tools.JavaFileObject;
-import org.junit.Test;
 
 import static com.google.common.truth.Truth.assertAbout;
 import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource;
@@ -54,7 +57,7 @@ public class PaperParcelAutoValueExtensionTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelAutoValue_Test {",
             "  @NonNull",
             "  static final Parcelable.Creator<AutoValue_Test> CREATOR = new Parcelable.Creator<AutoValue_Test>() {",
@@ -88,7 +91,7 @@ public class PaperParcelAutoValueExtensionTest {
     JavaFileObject source =
         JavaFileObjects.forSourceString("test.Test", Joiner.on('\n').join(
             "package test;",
-            "import android.support.annotation.Nullable;",
+            "import androidx.annotation.Nullable;",
             "import com.google.auto.value.AutoValue;",
             "import android.os.Parcelable;",
             "@AutoValue",
@@ -102,7 +105,7 @@ public class PaperParcelAutoValueExtensionTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.Nullable;",
+            "import androidx.annotation.Nullable;",
             "import java.lang.Integer;",
             "import java.lang.Override;",
             "import paperparcel.PaperParcel;",
@@ -214,7 +217,7 @@ public class PaperParcelAutoValueExtensionTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelAutoValue_Test {",
             "  @NonNull",
             "  static final Parcelable.Creator<AutoValue_Test> CREATOR = new Parcelable.Creator<AutoValue_Test>() {",
@@ -484,7 +487,7 @@ public class PaperParcelAutoValueExtensionTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelAutoValue_Test {",
             "  @NonNull",
             "  static final Parcelable.Creator<AutoValue_Test> CREATOR = new Parcelable.Creator<AutoValue_Test>() {",
@@ -571,7 +574,7 @@ public class PaperParcelAutoValueExtensionTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelAutoValue_Test {",
             "  @NonNull",
             "  static final Parcelable.Creator<AutoValue_Test> CREATOR = new Parcelable.Creator<AutoValue_Test>() {",
diff --git a/paperparcel/src/test/java/paperparcel/PaperParcelProcessorTest.java b/paperparcel/src/test/java/paperparcel/PaperParcelProcessorTest.java
index b572fc88..22d7d3ac 100644
--- a/paperparcel/src/test/java/paperparcel/PaperParcelProcessorTest.java
+++ b/paperparcel/src/test/java/paperparcel/PaperParcelProcessorTest.java
@@ -2,9 +2,12 @@
 
 import com.google.common.base.Joiner;
 import com.google.testing.compile.JavaFileObjects;
+
+import org.junit.Test;
+
 import java.util.Arrays;
+
 import javax.tools.JavaFileObject;
-import org.junit.Test;
 
 import static com.google.common.truth.Truth.assertAbout;
 import static com.google.testing.compile.JavaSourceSubjectFactory.javaSource;
@@ -113,11 +116,11 @@ public class PaperParcelProcessorTest {
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
             "import android.os.PersistableBundle;",
-            "import android.support.annotation.NonNull;",
             "import android.util.Size;",
             "import android.util.SizeF;",
             "import android.util.SparseArray;",
             "import android.util.SparseBooleanArray;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Collection;",
             "import java.util.List;",
             "import java.util.Map;",
@@ -533,7 +536,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -797,7 +800,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -864,7 +867,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -923,7 +926,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -983,7 +986,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1049,7 +1052,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1134,7 +1137,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.HashMap;",
             "import java.util.List;",
             "import java.util.Map;",
@@ -1297,7 +1300,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ParcelableAdapter;",
             "final class PaperParcelTest {",
@@ -1356,7 +1359,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Map;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.MapAdapter;",
@@ -1441,7 +1444,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Date;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.Utils;",
@@ -1560,7 +1563,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1626,7 +1629,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1692,7 +1695,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1765,7 +1768,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1835,7 +1838,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1898,7 +1901,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -1964,7 +1967,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -2058,7 +2061,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ListAdapter;",
@@ -2179,7 +2182,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.Utils;",
             "final class PaperParcelTest {",
@@ -2268,7 +2271,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.Utils;",
             "final class PaperParcelTest {",
@@ -2345,7 +2348,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.internal.Utils;",
             "final class PaperParcelTest {",
             "  @NonNull",
@@ -2409,7 +2412,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ListAdapter;",
@@ -2484,7 +2487,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ListAdapter;",
@@ -2557,7 +2560,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ListAdapter;",
@@ -2631,7 +2634,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ListAdapter;",
@@ -2703,7 +2706,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ListAdapter;",
@@ -2778,7 +2781,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ListAdapter;",
@@ -2860,7 +2863,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "final class PaperParcelTest {",
             "  @NonNull",
             "  static final Parcelable.Creator<Test> CREATOR = new Parcelable.Creator<Test>() {",
@@ -2931,7 +2934,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.internal.StaticAdapters;",
             "final class PaperParcelTest {",
             "  @NonNull",
@@ -3010,7 +3013,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Date;",
             "import paperparcel.TypeAdapter;",
             "final class PaperParcelTest {",
@@ -3094,7 +3097,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.HashMap;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.StaticAdapters;",
@@ -3184,7 +3187,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.ArrayList;",
             "import java.util.List;",
             "import paperparcel.TypeAdapter;",
@@ -3260,7 +3263,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ParcelableAdapter;",
             "final class PaperParcelTest {",
@@ -3521,7 +3524,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.Utils;",
             "final class PaperParcelTest {",
@@ -3611,7 +3614,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ParcelableAdapter;",
             "import paperparcel.internal.StaticAdapters;",
@@ -3753,7 +3756,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Date;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.Utils;",
@@ -3834,7 +3837,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Date;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.Utils;",
@@ -3917,7 +3920,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Date;",
             "import java.util.Map;",
             "import paperparcel.TypeAdapter;",
@@ -4001,7 +4004,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import java.util.Date;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.Utils;",
@@ -4076,7 +4079,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ParcelableAdapter;",
             "final class PaperParcelTest {",
@@ -4159,7 +4162,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ParcelableAdapter;",
             "final class PaperParcelTest {",
@@ -4299,7 +4302,7 @@ public class PaperParcelProcessorTest {
             "package test;",
             "import android.os.Parcel;",
             "import android.os.Parcelable;",
-            "import android.support.annotation.NonNull;",
+            "import androidx.annotation.NonNull;",
             "import paperparcel.TypeAdapter;",
             "import paperparcel.internal.ParcelableAdapter;",
             "final class PaperParcelRoot {",