Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
AChep committed Nov 27, 2021
1 parent 40b42c7 commit 9eed822
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
16 changes: 8 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ buildscript {

ext.kotlin_version = '1.5.31'
ext.kotlin_coroutines_version = '1.5.2'
ext.ktx_lib_version = '1.5.0'
ext.constraintlayout_lib_version = '2.1.0'
ext.appcompat_lib_version = '1.3.1'
ext.recyclerview_lib_version = '1.2.1'
ext.wear_lib_version = '1.2.0'
ext.ktx_lib_version = '1.7.0'
ext.constraintlayout_lib_version = '2.1.2'
ext.appcompat_lib_version = '1.4.0'
ext.recyclerview_lib_version = '1.3.0-alpha01'
ext.wear_lib_version = '1.3.0-alpha01'
ext.androidx_lib_version = '1.0.0'
ext.config_version = '2.2.0'
ext.wearable_version = '2.8.1'
ext.lifecycle_version = "2.2.0"
ext.lifecycle_version = "2.4.0"
ext.arrow_version = "1.0.0"
// https://mvnrepository.com/artifact/com.google.android.material/material
ext.material_version = "1.5.0-alpha05"
ext.material_version = "1.5.0-beta01"

ext.firebase_analytics_version = "19.0.0"
ext.firebase_crashlytics_version = "2.10.1"
Expand All @@ -36,7 +36,7 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
3 changes: 2 additions & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ dependencies {
implementation "androidx.wear:wear:$wear_lib_version"
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_lib_version"
api "com.github.AChep:bindin:1.4.0"
api "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
api "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

implementation 'com.google.android.gms:play-services-location:18.0.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ class SettingsViewModel(
private val config: Cfg,
private val keys: Set<Int>
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T {
override fun <T : ViewModel> create(modelClass: Class<T>): T {
return when {
modelClass.isAssignableFrom(SettingsViewModel::class.java) -> {
val viewModel = SettingsViewModel(
Expand Down
1 change: 0 additions & 1 deletion mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ dependencies {
implementation "androidx.appcompat:appcompat:$appcompat_lib_version"
implementation "androidx.wear:wear:$wear_lib_version"
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_lib_version"
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"

implementation "com.google.android.material:material:$material_version"

Expand Down
2 changes: 1 addition & 1 deletion wear/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:$appcompat_lib_version"
implementation "androidx.wear:wear:$wear_lib_version"
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_lib_version"
implementation "androidx.work:work-runtime-ktx:2.7.0"
implementation "androidx.work:work-runtime-ktx:2.7.1"

implementation "com.google.android.material:material:$material_version"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class ComplicationEditorViewModel(
private val application: Application,
private val watchComplicationId: Int,
) : ViewModelProvider.Factory {
override fun <T : ViewModel?> create(modelClass: Class<T>): T =
override fun <T : ViewModel> create(modelClass: Class<T>): T =
ComplicationEditorViewModel(
application = application,
watchComplicationId = watchComplicationId,
Expand Down

0 comments on commit 9eed822

Please sign in to comment.