Skip to content
This repository was archived by the owner on Dec 16, 2023. It is now read-only.

Commit de3fd54

Browse files
MarkNjungeMarkNjunge
authored
Migrate to androidx (#6)
* Update dependencies * Run automatic migration * Move dependencies to separate file * Update versions * Fix Android config mismatch * Fix build error
1 parent dfa2cd9 commit de3fd54

72 files changed

Lines changed: 409 additions & 341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ apply plugin: 'kotlin-android-extensions'
55
apply plugin: 'io.fabric'
66

77
android {
8-
compileSdkVersion 27
8+
compileSdkVersion androidConfig.compileSdk
99
defaultConfig {
1010
applicationId "com.marknkamau.justjava"
11-
minSdkVersion 21
12-
targetSdkVersion 27
11+
minSdkVersion androidConfig.minSdk
12+
targetSdkVersion androidConfig.targetSdk
1313
versionCode 6
1414
versionName "1.4.0"
1515
multiDexEnabled true
1616
vectorDrawables.useSupportLibrary = true
17-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
17+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
}
1919
buildTypes {
2020
debug {
21-
ext.alwaysUpdateBuildId = false
22-
ext.enableCrashlytics = false
21+
ext.alwaysUpdateBuildId = false
22+
ext.enableCrashlytics = false
2323
}
2424
release {
2525
minifyEnabled true
@@ -32,43 +32,43 @@ dependencies {
3232
implementation project(':core')
3333

3434
implementation fileTree(include: ['*.jar'], dir: 'libs')
35-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}"
35+
implementation deps.kotlinStdlib
3636

3737
//Android libraries
38-
implementation "com.android.support:design:${versions.support}"
39-
implementation "com.android.support:cardview-v7:${versions.support}"
40-
implementation "com.android.support:appcompat-v7:${versions.support}"
41-
implementation "com.android.support:recyclerview-v7:${versions.support}"
42-
implementation "com.android.support.constraint:constraint-layout:${versions.constraintLayout}"
38+
implementation deps.material
39+
implementation deps.cardview
40+
implementation deps.appcompat
41+
implementation deps.recycerview
42+
implementation deps.constraintLayout
4343

4444
//Firebase libraries
45-
implementation "com.google.firebase:firebase-messaging:${versions.firebase.messaging}"
45+
implementation deps.firebaseMessaging
4646

4747
// Room
48-
implementation "android.arch.persistence.room:runtime:${versions.room}"
49-
implementation "android.arch.persistence.room:rxjava2:${versions.room}"
50-
kapt "android.arch.persistence.room:compiler:${versions.room}"
48+
implementation deps.roomRuntime
49+
implementation deps.roomRxJava
50+
kapt deps.roomCompiler
5151

5252
// Rx
53-
implementation "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}"
54-
implementation "io.reactivex.rxjava2:rxjava:${versions.rxjava}"
55-
implementation "io.reactivex.rxjava2:rxkotlin:${versions.rxkotlin}"
53+
implementation deps.rxAndroid
54+
implementation deps.rxJava
55+
implementation deps.rxKotlin
5656

5757
// Other libraries
58-
implementation "com.squareup.picasso:picasso:${versions.picasso}"
59-
implementation "com.jakewharton.timber:timber:${versions.timber}"
60-
implementation "com.crashlytics.sdk.android:crashlytics:${versions.crashlytics}"
61-
debugImplementation "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}"
62-
releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakCanary}"
58+
implementation deps.picasso
59+
implementation deps.timber
60+
implementation deps.crashlytics
61+
debugImplementation deps.leakCanary
62+
releaseImplementation deps.leakCanaryNoOp
6363

6464
// Test libraries
65-
testImplementation "junit:junit:${versions.junit}"
66-
testImplementation "org.mockito:mockito-core:${versions.mockitoCore}"
67-
testImplementation "com.nhaarman:mockito-kotlin-kt1.1:${versions.mockitoKotlin}"
68-
androidTestImplementation "com.android.support.test:runner:${versions.testRunner}"
69-
androidTestImplementation "com.android.support.test:rules:${versions.testRules}"
70-
androidTestImplementation "com.android.support.test.espresso:espresso-core:${versions.espresso}"
71-
androidTestImplementation "com.android.support.test.espresso:espresso-contrib:${versions.espresso}"
65+
testImplementation deps.junit
66+
testImplementation deps.mockitoCore
67+
testImplementation deps.mockitoKotlin
68+
androidTestImplementation deps.testRunner
69+
androidTestImplementation deps.testRules
70+
androidTestImplementation deps.espressoCore
71+
androidTestImplementation deps.espressoContrib
7272
}
7373

7474
apply plugin: 'com.google.gms.google-services'

‎app/src/androidTest/java/com/marknkamau/justjava/ui/drinkdetails/DrinkDetailsActivityTest.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.marknkamau.justjava.ui.drinkdetails
22

33
import android.content.Intent
4-
import android.support.test.espresso.Espresso.onView
5-
import android.support.test.espresso.assertion.ViewAssertions.matches
6-
import android.support.test.espresso.matcher.ViewMatchers.*
7-
import android.support.test.filters.LargeTest
8-
import android.support.test.rule.ActivityTestRule
9-
import android.support.test.runner.AndroidJUnit4
4+
import androidx.test.espresso.Espresso.onView
5+
import androidx.test.espresso.assertion.ViewAssertions.matches
6+
import androidx.test.espresso.matcher.ViewMatchers.*
7+
import androidx.test.filters.LargeTest
8+
import androidx.test.rule.ActivityTestRule
9+
import androidx.test.runner.AndroidJUnit4
1010
import com.marknkamau.justjava.R
1111
import com.marknjunge.core.data.local.DrinksProvider
1212
import org.junit.Rule

‎app/src/androidTest/java/com/marknkamau/justjava/ui/main/MainActivityTest.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package com.marknkamau.justjava.ui.main
22

3-
import android.support.test.espresso.Espresso.onView
4-
import android.support.test.espresso.action.ViewActions
5-
import android.support.test.espresso.assertion.ViewAssertions.matches
6-
import android.support.test.espresso.contrib.RecyclerViewActions
7-
import android.support.test.espresso.matcher.ViewMatchers.*
8-
import android.support.test.filters.LargeTest
9-
import android.support.test.rule.ActivityTestRule
10-
import android.support.test.runner.AndroidJUnit4
11-
import android.support.v7.widget.RecyclerView
3+
import androidx.test.espresso.Espresso.onView
4+
import androidx.test.espresso.action.ViewActions
5+
import androidx.test.espresso.assertion.ViewAssertions.matches
6+
import androidx.test.espresso.contrib.RecyclerViewActions
7+
import androidx.test.espresso.matcher.ViewMatchers.*
8+
import androidx.test.filters.LargeTest
9+
import androidx.test.rule.ActivityTestRule
10+
import androidx.test.runner.AndroidJUnit4
11+
import androidx.recyclerview.widget.RecyclerView
1212
import com.marknkamau.justjava.R
1313
import com.marknjunge.core.data.local.DrinksProvider
1414
import org.junit.Rule
@@ -38,7 +38,7 @@ class MainActivityTest {
3838

3939
onView(withText(firstItemName)).check(matches(isDisplayed()))
4040

41-
onView(withId(R.id.rvCatalog)).perform(RecyclerViewActions.scrollToPosition<RecyclerView.ViewHolder>(drinksList.size - 1))
41+
onView(withId(R.id.rvCatalog)).perform(RecyclerViewActions.scrollToPosition<androidx.recyclerview.widget.RecyclerView.ViewHolder>(drinksList.size - 1))
4242
onView(withText(lastItemName)).check(matches(isDisplayed()))
4343

4444
}

‎app/src/main/java/com/marknkamau/justjava/JustJavaApp.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.marknkamau.justjava
22

33
import android.app.Application
4-
import android.arch.persistence.room.Room
4+
import androidx.room.Room
55
import android.preference.PreferenceManager
6-
import android.support.v4.content.LocalBroadcastManager
6+
import androidx.localbroadcastmanager.content.LocalBroadcastManager
77
import com.marknjunge.core.auth.AuthService
88
import com.marknjunge.core.auth.AuthServiceImpl
99
import com.marknkamau.justjava.data.local.CartDatabase
@@ -26,7 +26,7 @@ class JustJavaApp : Application() {
2626
lateinit var cartDatabase: CartDatabase
2727
lateinit var notificationHelper: NotificationHelper
2828
lateinit var mpesaInteractor: MpesaInteractor
29-
lateinit var broadcastManager: LocalBroadcastManager
29+
lateinit var broadcastManager: androidx.localbroadcastmanager.content.LocalBroadcastManager
3030

3131
override fun onCreate() {
3232
super.onCreate()
@@ -55,7 +55,7 @@ class JustJavaApp : Application() {
5555

5656
notificationHelper = NotificationHelper(this)
5757

58-
broadcastManager = LocalBroadcastManager.getInstance(this)
58+
broadcastManager = androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(this)
5959
}
6060

6161
}

‎app/src/main/java/com/marknkamau/justjava/data/local/CartDao.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.marknkamau.justjava.data.local
22

3-
import android.arch.persistence.room.*
3+
import androidx.room.*
44
import com.marknkamau.justjava.data.models.CartItem
55
import io.reactivex.Single
66

‎app/src/main/java/com/marknkamau/justjava/data/local/CartDatabase.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.marknkamau.justjava.data.local
22

3-
import android.arch.persistence.room.Database
4-
import android.arch.persistence.room.RoomDatabase
3+
import androidx.room.Database
4+
import androidx.room.RoomDatabase
55
import com.marknkamau.justjava.data.models.CartItem
66

77
@Database(entities = [(CartItem::class)], version = 1)

‎app/src/main/java/com/marknkamau/justjava/data/local/PreferencesRepositoryImpl.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class PreferencesRepositoryImpl(private val sharedPreferences: SharedPreferences
2323

2424
override fun getUserDetails(): UserDetails {
2525
return UserDetails(
26-
sharedPreferences.getString(id, ""),
27-
sharedPreferences.getString(email, ""),
28-
sharedPreferences.getString(name, ""),
29-
sharedPreferences.getString(phone, ""),
30-
sharedPreferences.getString(address, "")
26+
sharedPreferences.getString(id, "") as String,
27+
sharedPreferences.getString(email, "") as String,
28+
sharedPreferences.getString(name, "") as String,
29+
sharedPreferences.getString(phone, "") as String,
30+
sharedPreferences.getString(address, "") as String
3131
)
3232
}
3333

‎app/src/main/java/com/marknkamau/justjava/data/models/CartItem.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.marknkamau.justjava.data.models
22

3-
import android.arch.persistence.room.Entity
4-
import android.arch.persistence.room.PrimaryKey
3+
import androidx.room.Entity
4+
import androidx.room.PrimaryKey
55
import android.os.Parcel
66
import android.os.Parcelable
77
import com.marknjunge.core.model.OrderItem

‎app/src/main/java/com/marknkamau/justjava/ui/BaseActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package com.marknkamau.justjava.ui
22

33
import android.content.Intent
44

5-
import android.support.v7.app.AppCompatActivity
5+
import androidx.appcompat.app.AppCompatActivity
66
import android.view.Menu
77
import android.view.MenuItem
88
import android.widget.Toast

‎app/src/main/java/com/marknkamau/justjava/ui/SplashActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.marknkamau.justjava.ui
22

3-
import android.support.v7.app.AppCompatActivity
3+
import androidx.appcompat.app.AppCompatActivity
44
import android.content.Intent
55
import android.os.Bundle
66
import com.marknkamau.justjava.ui.main.MainActivity

0 commit comments

Comments
 (0)