Convert project to use AndroidX

android · Sep 17, 2018 · 9b2de23 · 9b2de23
1 parent 5b03fed
commit 9b2de23
Show file tree

Hide file tree

Showing 40 changed files with 177 additions and 173 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,7 +29,7 @@ android {
         applicationId "com.google.samples.apps.sunflower"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         versionCode 1
         versionName "0.1.5"
         vectorDrawables.useSupportLibrary true
@@ -47,27 +47,27 @@ android {
 }
 
 dependencies {
-    kapt "android.arch.persistence.room:compiler:$rootProject.roomVersion"
+    kapt "androidx.room:room-compiler:$rootProject.roomVersion"
     kapt "com.github.bumptech.glide:compiler:$rootProject.glideVersion"
-    implementation "android.arch.lifecycle:extensions:$rootProject.lifecycleVersion"
     implementation "android.arch.navigation:navigation-fragment-ktx:$rootProject.navigationVersion"
     implementation "android.arch.navigation:navigation-ui-ktx:$rootProject.navigationVersion"
-    implementation "android.arch.persistence.room:runtime:$rootProject.roomVersion"
     implementation "android.arch.work:work-runtime-ktx:$rootProject.workVersion"
+    implementation "androidx.appcompat:appcompat:$rootProject.supportLibraryVersion"
+    implementation "androidx.constraintlayout:constraintlayout:$rootProject.constraintLayoutVersion"
     implementation "androidx.core:core-ktx:$rootProject.ktxVersion"
-    implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:support-v4:$rootProject.supportLibraryVersion"
-    implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
-    implementation "com.android.support.constraint:constraint-layout:$rootProject.constraintLayoutVersion"
-    implementation "com.android.support:design:$rootProject.supportLibraryVersion"
+    implementation "androidx.legacy:legacy-support-v4:$rootProject.supportLibraryVersion"
+    implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.lifecycleVersion"
+    implementation "androidx.recyclerview:recyclerview:$rootProject.supportLibraryVersion"
+    implementation "androidx.room:room-runtime:$rootProject.roomVersion"
     implementation "com.github.bumptech.glide:glide:$rootProject.glideVersion"
+    implementation "com.google.android.material:material:$rootProject.supportLibraryVersion"
     implementation "com.google.code.gson:gson:$rootProject.gsonVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlinVersion"
 
     // Testing dependencies
-    androidTestImplementation "com.android.support.test.espresso:espresso-intents:$rootProject.espressoVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion"
-    androidTestImplementation "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
-    androidTestImplementation "com.android.support.test.uiautomator:uiautomator-v18:$uiAutomatorVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-contrib:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-core:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:$rootProject.espressoVersion"
+    androidTestImplementation "androidx.test.uiautomator:uiautomator:$rootProject.uiAutomatorVersion"
     testImplementation "junit:junit:$rootProject.junitVersion"
 }
diff --git a/app/src/androidTest/java/com/google/samples/apps/sunflower/GardenActivityTest.kt b/app/src/androidTest/java/com/google/samples/apps/sunflower/GardenActivityTest.kt
@@ -16,21 +16,21 @@
 
 package com.google.samples.apps.sunflower
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.contrib.DrawerMatchers.isClosed
-import android.support.test.espresso.contrib.DrawerMatchers.isOpen
-import android.support.test.espresso.contrib.NavigationViewActions.navigateTo
-import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
-import android.support.test.espresso.matcher.ViewMatchers.isRoot
-import android.support.test.espresso.matcher.ViewMatchers.withContentDescription
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.rule.ActivityTestRule
-import android.support.test.uiautomator.UiDevice
 import android.view.Gravity
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.matches
+import androidx.test.espresso.contrib.DrawerMatchers.isClosed
+import androidx.test.espresso.contrib.DrawerMatchers.isOpen
+import androidx.test.espresso.contrib.NavigationViewActions.navigateTo
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.rule.ActivityTestRule
+import androidx.test.uiautomator.UiDevice
 import com.google.samples.apps.sunflower.utilities.getToolbarNavigationContentDescription
 import org.junit.Assert.assertEquals
 import org.junit.Rule

diff --git a/app/src/androidTest/java/com/google/samples/apps/sunflower/PlantDetailFragmentTest.kt b/app/src/androidTest/java/com/google/samples/apps/sunflower/PlantDetailFragmentTest.kt
@@ -18,18 +18,18 @@ package com.google.samples.apps.sunflower
 
 import android.accessibilityservice.AccessibilityService
 import android.content.Intent
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.intent.Intents
-import android.support.test.espresso.intent.Intents.intended
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasAction
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasType
-import android.support.test.espresso.matcher.ViewMatchers.withId
-import android.support.test.rule.ActivityTestRule
-import android.support.test.runner.AndroidJUnit4
 import androidx.navigation.findNavController
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.Intents.intended
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasType
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.rule.ActivityTestRule
+import androidx.test.runner.AndroidJUnit4
 import com.google.samples.apps.sunflower.utilities.chooser
 import com.google.samples.apps.sunflower.utilities.testPlant
 import org.hamcrest.CoreMatchers.allOf

diff --git a/app/src/androidTest/java/com/google/samples/apps/sunflower/data/GardenPlantingDaoTest.kt b/app/src/androidTest/java/com/google/samples/apps/sunflower/data/GardenPlantingDaoTest.kt
@@ -16,9 +16,9 @@
 
 package com.google.samples.apps.sunflower.data
 
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
-import android.support.test.espresso.matcher.ViewMatchers.assertThat
+import androidx.room.Room
+import androidx.test.InstrumentationRegistry
+import androidx.test.espresso.matcher.ViewMatchers.assertThat
 import com.google.samples.apps.sunflower.utilities.getValue
 import com.google.samples.apps.sunflower.utilities.testCalendar
 import com.google.samples.apps.sunflower.utilities.testGardenPlanting

diff --git a/app/src/androidTest/java/com/google/samples/apps/sunflower/data/PlantDaoTest.kt b/app/src/androidTest/java/com/google/samples/apps/sunflower/data/PlantDaoTest.kt
@@ -16,9 +16,9 @@
 
 package com.google.samples.apps.sunflower.data
 
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.room.Room
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 import com.google.samples.apps.sunflower.utilities.getValue
 import org.hamcrest.Matchers.equalTo
 import org.junit.After

diff --git a/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/LiveDataTestUtil.kt b/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/LiveDataTestUtil.kt
@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.sunflower.utilities
 
-import android.arch.lifecycle.LiveData
+import androidx.lifecycle.LiveData
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 

diff --git a/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/TestUtils.kt b/app/src/androidTest/java/com/google/samples/apps/sunflower/utilities/TestUtils.kt
@@ -18,12 +18,12 @@ package com.google.samples.apps.sunflower.utilities
 
 import android.app.Activity
 import android.content.Intent
-import android.support.design.widget.CollapsingToolbarLayout
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasAction
-import android.support.test.espresso.intent.matcher.IntentMatchers.hasExtra
-import android.support.test.espresso.matcher.BoundedMatcher
-import android.support.v7.widget.Toolbar
 import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasAction
+import androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra
+import androidx.test.espresso.matcher.BoundedMatcher
+import com.google.android.material.appbar.CollapsingToolbarLayout
 import com.google.samples.apps.sunflower.data.GardenPlanting
 import com.google.samples.apps.sunflower.data.Plant
 import org.hamcrest.Description

diff --git a/...androidTest/java/com/google/samples/apps/sunflower/viewmodels/PlantDetailViewModelTest.kt b/...androidTest/java/com/google/samples/apps/sunflower/viewmodels/PlantDetailViewModelTest.kt
@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.sunflower.viewmodels
 
-import android.arch.persistence.room.Room
-import android.support.test.InstrumentationRegistry
+import androidx.room.Room
+import androidx.test.InstrumentationRegistry
 import com.google.samples.apps.sunflower.data.AppDatabase
 import com.google.samples.apps.sunflower.data.GardenPlantingRepository
 import com.google.samples.apps.sunflower.data.PlantRepository

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/GardenActivity.kt b/app/src/main/java/com/google/samples/apps/sunflower/GardenActivity.kt
@@ -16,11 +16,11 @@
 
 package com.google.samples.apps.sunflower
 
-import android.databinding.DataBindingUtil
 import android.os.Bundle
-import android.support.v4.view.GravityCompat
-import android.support.v4.widget.DrawerLayout
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.GravityCompat
+import androidx.databinding.DataBindingUtil
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.Navigation
 import androidx.navigation.ui.NavigationUI
 import androidx.navigation.ui.setupWithNavController

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/GardenFragment.kt b/app/src/main/java/com/google/samples/apps/sunflower/GardenFragment.kt
@@ -16,13 +16,13 @@
 
 package com.google.samples.apps.sunflower
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 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 androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import com.google.samples.apps.sunflower.adapters.GardenPlantingAdapter
 import com.google.samples.apps.sunflower.databinding.FragmentGardenBinding
 import com.google.samples.apps.sunflower.utilities.InjectorUtils

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt b/app/src/main/java/com/google/samples/apps/sunflower/PlantDetailFragment.kt
@@ -16,22 +16,21 @@
 
 package com.google.samples.apps.sunflower
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.content.Intent
-import android.databinding.DataBindingUtil
 import android.os.Build
 import android.os.Bundle
-import android.support.design.widget.Snackbar
-import android.support.v4.app.Fragment
-import android.support.v4.app.ShareCompat
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-
+import androidx.core.app.ShareCompat
+import androidx.databinding.DataBindingUtil
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
+import com.google.android.material.snackbar.Snackbar
 import com.google.samples.apps.sunflower.databinding.FragmentPlantDetailBinding
 import com.google.samples.apps.sunflower.utilities.InjectorUtils
 import com.google.samples.apps.sunflower.viewmodels.PlantDetailViewModel

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/PlantListFragment.kt b/app/src/main/java/com/google/samples/apps/sunflower/PlantListFragment.kt
@@ -16,16 +16,16 @@
 
 package com.google.samples.apps.sunflower
 
-import android.arch.lifecycle.Observer
-import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
-import android.support.v4.app.Fragment
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.Observer
+import androidx.lifecycle.ViewModelProviders
 import com.google.samples.apps.sunflower.adapters.PlantAdapter
 import com.google.samples.apps.sunflower.databinding.FragmentPlantListBinding
 import com.google.samples.apps.sunflower.utilities.InjectorUtils

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/adapters/BindingAdapters.kt b/app/src/main/java/com/google/samples/apps/sunflower/adapters/BindingAdapters.kt
@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.sunflower.adapters
 
-import android.databinding.BindingAdapter
 import android.view.View
+import androidx.databinding.BindingAdapter
 
 @BindingAdapter("isGone")
 fun bindIsGone(view: View, isGone: Boolean) {

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/adapters/GardenPlantDiffCallback.kt b/app/src/main/java/com/google/samples/apps/sunflower/adapters/GardenPlantDiffCallback.kt
@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.sunflower.adapters
 
-import android.support.v7.util.DiffUtil
+import androidx.recyclerview.widget.DiffUtil
 import com.google.samples.apps.sunflower.data.PlantAndGardenPlantings
 
 class GardenPlantDiffCallback : DiffUtil.ItemCallback<PlantAndGardenPlantings>() {

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/adapters/GardenPlantingAdapter.kt b/app/src/main/java/com/google/samples/apps/sunflower/adapters/GardenPlantingAdapter.kt
@@ -17,11 +17,11 @@
 package com.google.samples.apps.sunflower.adapters
 
 import android.content.Context
-import android.databinding.DataBindingUtil
-import android.support.v7.recyclerview.extensions.ListAdapter
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import com.google.samples.apps.sunflower.R
 import com.google.samples.apps.sunflower.data.PlantAndGardenPlantings
 import com.google.samples.apps.sunflower.databinding.ListItemGardenPlantingBinding

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/adapters/PlantAdapter.kt b/app/src/main/java/com/google/samples/apps/sunflower/adapters/PlantAdapter.kt
@@ -16,12 +16,12 @@
 
 package com.google.samples.apps.sunflower.adapters
 
-import android.support.v7.recyclerview.extensions.ListAdapter
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.navigation.findNavController
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
 import com.google.samples.apps.sunflower.PlantListFragment
 import com.google.samples.apps.sunflower.PlantListFragmentDirections
 import com.google.samples.apps.sunflower.data.Plant

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/adapters/PlantDetailBindingAdapters.kt b/app/src/main/java/com/google/samples/apps/sunflower/adapters/PlantDetailBindingAdapters.kt
@@ -16,15 +16,15 @@
 
 package com.google.samples.apps.sunflower.adapters
 
-import android.databinding.BindingAdapter
-import android.support.design.widget.FloatingActionButton
 import android.text.SpannableStringBuilder
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.text.bold
 import androidx.core.text.italic
+import androidx.databinding.BindingAdapter
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.samples.apps.sunflower.R
 
 @BindingAdapter("imageFromUrl")

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/adapters/PlantDiffCallback.kt b/app/src/main/java/com/google/samples/apps/sunflower/adapters/PlantDiffCallback.kt
@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.sunflower.adapters
 
-import android.support.v7.util.DiffUtil
+import androidx.recyclerview.widget.DiffUtil
 import com.google.samples.apps.sunflower.data.Plant
 
 class PlantDiffCallback : DiffUtil.ItemCallback<Plant>() {

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/data/AppDatabase.kt b/app/src/main/java/com/google/samples/apps/sunflower/data/AppDatabase.kt
@@ -16,12 +16,12 @@
 
 package com.google.samples.apps.sunflower.data
 
-import android.arch.persistence.db.SupportSQLiteDatabase
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.Room
-import android.arch.persistence.room.RoomDatabase
-import android.arch.persistence.room.TypeConverters
 import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+import androidx.room.TypeConverters
+import androidx.sqlite.db.SupportSQLiteDatabase
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import com.google.samples.apps.sunflower.utilities.DATABASE_NAME

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/data/Converters.kt b/app/src/main/java/com/google/samples/apps/sunflower/data/Converters.kt
@@ -16,7 +16,7 @@
 
 package com.google.samples.apps.sunflower.data
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import java.util.Calendar
 
 /**

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlanting.kt b/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlanting.kt
@@ -16,11 +16,11 @@
 
 package com.google.samples.apps.sunflower.data
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.ForeignKey
-import android.arch.persistence.room.Index
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
 import java.util.Calendar
 
 /**

diff --git a/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt b/app/src/main/java/com/google/samples/apps/sunflower/data/GardenPlantingDao.kt
@@ -16,12 +16,12 @@
 
 package com.google.samples.apps.sunflower.data
 
-import android.arch.lifecycle.LiveData
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.Query
-import android.arch.persistence.room.Transaction
-import android.arch.persistence.room.Delete
+import androidx.lifecycle.LiveData
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import androidx.room.Transaction
 
 /**
  * The Data Access Object for the [GardenPlanting] class.