Merge pull request #74 from mhacks/androidx-refactor

Android X refactor
mhacks · Oct 1, 2018 · d733270 · d733270
2 parents a381d61 + 85dee46
commit d733270
Show file tree

Hide file tree

Showing 99 changed files with 258 additions and 261 deletions.
diff --git a/apk/build.gradle b/apk/build.gradle
@@ -13,7 +13,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -36,5 +36,5 @@ dependencies {
     implementation project(':base')
     implementation project(':ui')
 
-    implementation "com.android.support:support-v4:$google_play_version"
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
diff --git a/base/build.gradle b/base/build.gradle
@@ -12,7 +12,7 @@ ext {
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "27.0.3"
+    buildToolsVersion '28.0.2'
     baseFeature true
     dexOptions {
         javaMaxHeapSize "4g"
@@ -63,9 +63,9 @@ android {
         }
     }
 
-//    dataBinding {
-//        enabled = true
-//    }
+    dataBinding {
+        enabled = true
+    }
 
     productFlavors {
 
@@ -76,22 +76,22 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$rootProject.kotlin_version"
 
-    kapt 'com.android.databinding:compiler:3.1.4'
+//    kapt 'androidx.databinding:databinding-compiler:3.2.0'
 
     // Play Services
     implementation 'com.google.firebase:firebase-core:16.0.3'
-    implementation 'com.google.firebase:firebase-messaging:17.3.1'
+    implementation 'com.google.firebase:firebase-messaging:17.3.2'
 
-    implementation "com.android.support:appcompat-v7:$rootProject.google_play_version"
-    implementation "com.android.support:support-v4:$rootProject.google_play_version"
-    implementation "com.android.support:support-media-compat:$rootProject.google_play_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.media:media:1.0.0'
 
     // Networking
     implementation 'com.squareup.retrofit2:converter-moshi:2.4.0'
 
     // Persistence
-    implementation "android.arch.persistence.room:runtime:$rootProject.room_version"
-    implementation "android.arch.persistence.room:rxjava2:$rootProject.room_version"
+    implementation 'androidx.room:room-runtime:2.0.0-rc01'
+    implementation 'androidx.room:room-rxjava2:2.0.0-rc01'
 
     // RxJava
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
@@ -101,7 +101,7 @@ dependencies {
     // Debugging
     implementation 'com.jakewharton.timber:timber:4.7.0'
 
-    kapt "android.arch.persistence.room:compiler:$room_version"
+    kapt 'androidx.room:room-compiler:2.0.0-rc01'
 
     feature project(':ui')
 }

diff --git a/base/src/main/java/com/mhacks/app/data/models/AnnouncementResponse.kt b/base/src/main/java/com/mhacks/app/data/models/AnnouncementResponse.kt
@@ -1,7 +1,7 @@
 package com.mhacks.app.data.models
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import com.squareup.moshi.Json
 
 /**

diff --git a/base/src/main/java/com/mhacks/app/data/models/ConfigResponse.kt b/base/src/main/java/com/mhacks/app/data/models/ConfigResponse.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.data.models
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+
+import androidx.room.*
 import com.squareup.moshi.Json
 
 /**

diff --git a/base/src/main/java/com/mhacks/app/data/models/EventsResponse.kt b/base/src/main/java/com/mhacks/app/data/models/EventsResponse.kt
@@ -1,7 +1,6 @@
 package com.mhacks.app.data.models
 
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.*
 import android.os.Parcel
 import android.os.Parcelable
 import com.squareup.moshi.Json

diff --git a/base/src/main/java/com/mhacks/app/data/models/FloorResponse.kt b/base/src/main/java/com/mhacks/app/data/models/FloorResponse.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.data.models
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
+import androidx.room.Entity
+import androidx.room.PrimaryKey
 import com.squareup.moshi.Json
 
 /**

diff --git a/base/src/main/java/com/mhacks/app/data/models/Login.kt b/base/src/main/java/com/mhacks/app/data/models/Login.kt
@@ -4,7 +4,7 @@ package com.mhacks.app.data.models
  * Model for storing login information.
  */
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import com.squareup.moshi.Json
 
 @Entity(tableName = "login")

diff --git a/base/src/main/java/com/mhacks/app/data/models/User.kt b/base/src/main/java/com/mhacks/app/data/models/User.kt
@@ -1,9 +1,10 @@
 package com.mhacks.app.data.models
 
-import android.arch.persistence.room.ColumnInfo
-import android.arch.persistence.room.Entity
-import android.arch.persistence.room.PrimaryKey
-import android.arch.persistence.room.TypeConverters
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import androidx.room.TypeConverters
 import com.mhacks.app.data.room.Converters
 import com.squareup.moshi.Json
 

diff --git a/base/src/main/java/com/mhacks/app/data/models/common/TextMessage.kt b/base/src/main/java/com/mhacks/app/data/models/common/TextMessage.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.data.models.common
 
-import android.support.annotation.StringRes
+import androidx.annotation.StringRes
 
 data class TextMessage(
         @StringRes val textResId: Int?,

diff --git a/base/src/main/java/com/mhacks/app/data/network/fcm/FCMMessageHandler.kt b/base/src/main/java/com/mhacks/app/data/network/fcm/FCMMessageHandler.kt
@@ -3,8 +3,8 @@ package com.mhacks.app.data.network.fcm
 import android.app.Notification
 import android.content.Intent
 import android.provider.Settings
-import android.support.v4.app.NotificationCompat
-import android.support.v4.app.NotificationManagerCompat
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.mhacks.app.R

diff --git a/base/src/main/java/com/mhacks/app/data/room/Converters.kt b/base/src/main/java/com/mhacks/app/data/room/Converters.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.data.room
 
-import android.arch.persistence.room.TypeConverter
+import androidx.room.TypeConverter
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types

diff --git a/base/src/main/java/com/mhacks/app/data/room/MHacksDatabase.kt b/base/src/main/java/com/mhacks/app/data/room/MHacksDatabase.kt
@@ -1,7 +1,7 @@
 package com.mhacks.app.data.room
 
-import android.arch.persistence.room.Database
-import android.arch.persistence.room.RoomDatabase
+import androidx.room.Database
+import androidx.room.RoomDatabase
 import com.mhacks.app.data.models.*
 import com.mhacks.app.data.room.dao.*
 

diff --git a/base/src/main/java/com/mhacks/app/data/room/dao/AnnouncementDao.kt b/base/src/main/java/com/mhacks/app/data/room/dao/AnnouncementDao.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.data.room.dao
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import com.mhacks.app.data.models.Announcement
 import io.reactivex.Single
 

diff --git a/base/src/main/java/com/mhacks/app/data/room/dao/ConfigurationDao.kt b/base/src/main/java/com/mhacks/app/data/room/dao/ConfigurationDao.kt
@@ -1,9 +1,6 @@
 package com.mhacks.app.data.room.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy
-import android.arch.persistence.room.Query
+import androidx.room.*
 import com.mhacks.app.data.models.Configuration
 import io.reactivex.Single
 

diff --git a/base/src/main/java/com/mhacks/app/data/room/dao/EventDao.kt b/base/src/main/java/com/mhacks/app/data/room/dao/EventDao.kt
@@ -1,6 +1,9 @@
 package com.mhacks.app.data.room.dao
 
-import android.arch.persistence.room.*
+
+import android.os.Parcel
+import android.os.Parcelable
+import androidx.room.*
 import com.mhacks.app.data.models.Event
 import io.reactivex.Single
 

diff --git a/base/src/main/java/com/mhacks/app/data/room/dao/LoginDao.kt b/base/src/main/java/com/mhacks/app/data/room/dao/LoginDao.kt
@@ -1,9 +1,9 @@
 package com.mhacks.app.data.room.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
 import com.mhacks.app.data.models.Login
 import io.reactivex.Single
 

diff --git a/base/src/main/java/com/mhacks/app/data/room/dao/MapFloorDao.kt b/base/src/main/java/com/mhacks/app/data/room/dao/MapFloorDao.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.data.room.dao
 
-import android.arch.persistence.room.*
+import androidx.room.*
 import com.mhacks.app.data.models.MapFloor
 import io.reactivex.Single
 

diff --git a/base/src/main/java/com/mhacks/app/data/room/dao/UserDao.kt b/base/src/main/java/com/mhacks/app/data/room/dao/UserDao.kt
@@ -1,9 +1,9 @@
 package com.mhacks.app.data.room.dao
 
-import android.arch.persistence.room.Dao
-import android.arch.persistence.room.Insert
-import android.arch.persistence.room.OnConflictStrategy
-import android.arch.persistence.room.Query
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
 import com.mhacks.app.data.models.User
 import io.reactivex.Single
 

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@
 buildscript {
 
     ext {
-        dagger_version = '2.17'
+        dagger_version = '2.16'
         kotlin_version = '1.2.70'
         anko_version = '0.10.0'
         room_version = '1.1.1'
@@ -16,7 +16,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:3.2.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 07 19:14:36 PDT 2018
+#Sun Sep 30 21:55:03 PDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/ui/build.gradle b/ui/build.gradle
@@ -18,14 +18,13 @@ android {
         versionCode 3
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -40,7 +39,7 @@ dependencies {
 
     testImplementation 'junit:junit:4.12'
 
-    kapt 'com.android.databinding:compiler:3.1.4'
+//    kapt 'androidx.databinding:databinding-compiler:3.2.0'
 
     implementation "com.google.dagger:dagger:$rootProject.dagger_version"
     implementation "com.google.dagger:dagger-android-support:$rootProject.dagger_version"
@@ -51,14 +50,14 @@ dependencies {
     implementation 'com.google.android.gms:play-services-vision:15.0.2'
 
     // Support libraries
-    implementation "com.android.support:appcompat-v7:$rootProject.google_play_version"
-    implementation "com.android.support:support-v4:$rootProject.google_play_version"
-    implementation "com.android.support:cardview-v7:$rootProject.google_play_version"
-    implementation "com.android.support:recyclerview-v7:$rootProject.google_play_version"
-    implementation "com.android.support:design:$rootProject.google_play_version"
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
 
     // View
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
     implementation 'com.github.kenglxn.QRGen:android:2.2.0'
     implementation 'com.github.vipulasri:timelineview:1.0.5'
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
@@ -76,19 +75,19 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
 
     // Persistence
-    implementation "android.arch.persistence.room:runtime:$rootProject.room_version"
-    implementation "android.arch.persistence.room:rxjava2:$rootProject.room_version"
+    implementation 'androidx.room:room-runtime:2.0.0-rc01'
+    implementation 'androidx.room:room-rxjava2:2.0.0-rc01'
 
     // RxJava
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.2'
     implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
 
     // Architecture Components
-    implementation "android.arch.lifecycle:extensions:$rootProject.lifecycle_version"
-    implementation "android.arch.lifecycle:reactivestreams:$rootProject.lifecycle_version"
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.0.0'
 
-    kapt "android.arch.lifecycle:compiler:$rootProject.lifecycle_version"
+    kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'
 
     // Debugging
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.0'

diff --git a/ui/src/main/java/com/mhacks/app/adapter/StringMessageAdapter.kt b/ui/src/main/java/com/mhacks/app/adapter/StringMessageAdapter.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.adapter
 
-import android.databinding.BindingAdapter
+import androidx.databinding.BindingAdapter
 import com.mhacks.app.data.models.common.TextMessage
 import com.mhacks.app.ui.common.ProgressWheel
 

diff --git a/ui/src/main/java/com/mhacks/app/di/MHacksViewModelFactory.kt b/ui/src/main/java/com/mhacks/app/di/MHacksViewModelFactory.kt
@@ -1,7 +1,7 @@
 package com.mhacks.app.di
 
-import android.arch.lifecycle.ViewModel
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
 import javax.inject.Inject
 import javax.inject.Provider
 

diff --git a/ui/src/main/java/com/mhacks/app/di/ViewModelKey.kt b/ui/src/main/java/com/mhacks/app/di/ViewModelKey.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.di
 
-import android.arch.lifecycle.ViewModel
+import androidx.lifecycle.ViewModel
 import dagger.MapKey
 import kotlin.reflect.KClass
 

diff --git a/ui/src/main/java/com/mhacks/app/di/ViewModelModule.kt b/ui/src/main/java/com/mhacks/app/di/ViewModelModule.kt
@@ -1,6 +1,6 @@
 package com.mhacks.app.di
 
-import android.arch.lifecycle.ViewModelProvider
+import androidx.lifecycle.ViewModelProvider
 import dagger.Binds
 import dagger.Module
 

diff --git a/ui/src/main/java/com/mhacks/app/di/module/RoomModule.kt b/ui/src/main/java/com/mhacks/app/di/module/RoomModule.kt
@@ -1,9 +1,8 @@
 package com.mhacks.app.di.module
 
 import android.app.Application
-import android.arch.persistence.room.Room
+import androidx.room.Room
 import com.mhacks.app.data.room.MHacksDatabase
-import com.mhacks.app.data.room.dao.LoginDao
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton

diff --git a/ui/src/main/java/com/mhacks/app/extension/View.kt b/ui/src/main/java/com/mhacks/app/extension/View.kt
@@ -1,8 +1,8 @@
 package com.mhacks.app.extension
 
-import android.support.annotation.StringRes
-import android.support.design.widget.Snackbar
 import android.view.View
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.Snackbar
 import com.mhacks.app.data.models.common.TextMessage
 
 fun View.showSnackBar(duration: Int, textMessage: TextMessage?) {