From 057d072e89140639e9d2b90fee02a7cbf33597d8 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 10 Dec 2021 16:29:05 +0100
Subject: [PATCH] update libs

---
 build.gradle                                              | 8 ++++----
 gradle/android_dependencies.gradle                        | 2 +-
 .../main/java/info/nightscout/shared/di/SharedModule.kt   | 2 +-
 wear/build.gradle                                         | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 19c6c3ce48..1051e5a721 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,19 +3,19 @@
 buildscript {
     ext {
         kotlin_version = '1.6.0'
-        coreVersion = '1.6.0'
+        coreVersion = '1.7.0'
         rxjava_version = '2.2.21'
         rxandroid_version = '2.1.1'
         rxkotlin_version = '2.4.0'
         room_version = '2.3.0'
-        lifecycle_version = '2.3.1'
+        lifecycle_version = '2.4.0'
         dagger_version = '2.40.5'
         coroutinesVersion = '1.4.1'
         activityVersion = '1.3.1'
         fragmentktx_version = '1.3.6'
         ormLiteVersion = '4.46'
         nav_version = '2.3.5'
-        appcompat_version = '1.3.1'
+        appcompat_version = '1.4.0'
         material_version = '1.4.0'
         constraintlayout_version = '2.1.0'
         preferencektx_version = '1.1.1'
@@ -30,7 +30,7 @@ buildscript {
         dexmakerVersion = "1.2"
         retrofit2Version = '2.9.0'
         okhttp3Version = '4.9.0'
-        byteBuddyVersion = '1.12.0'
+        byteBuddyVersion = '1.12.3'
 
         androidx_junit = '1.1.2'
         androidx_rules = '1.4.0-alpha04'
diff --git a/gradle/android_dependencies.gradle b/gradle/android_dependencies.gradle
index eb031288c2..7e07211845 100644
--- a/gradle/android_dependencies.gradle
+++ b/gradle/android_dependencies.gradle
@@ -1,5 +1,5 @@
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     defaultConfig {
         minSdkVersion 28
         targetSdkVersion 28
diff --git a/shared/src/main/java/info/nightscout/shared/di/SharedModule.kt b/shared/src/main/java/info/nightscout/shared/di/SharedModule.kt
index ae9bd8d2c2..d7a061e3b8 100644
--- a/shared/src/main/java/info/nightscout/shared/di/SharedModule.kt
+++ b/shared/src/main/java/info/nightscout/shared/di/SharedModule.kt
@@ -1,7 +1,7 @@
 package info.nightscout.shared.di
 
 import android.content.Context
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import dagger.Module
 import dagger.Provides
 import info.nightscout.shared.logging.AAPSLogger
diff --git a/wear/build.gradle b/wear/build.gradle
index 56ae862b06..c390f7db7b 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -118,9 +118,12 @@ dependencies {
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
+    implementation "androidx.core:core-ktx:$coreVersion"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation "androidx.preference:preference-ktx:$preferencektx_version"
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.wear:wear:1.2.0'
 
 
     compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
@@ -128,11 +131,8 @@ dependencies {
     implementation "com.google.android.gms:play-services-wearable:${playServicesWearable}"
     implementation(name: 'ustwo-clockwise-debug', ext: 'aar')
     implementation(name: 'wearpreferenceactivity-0.5.0', ext: 'aar')
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.wear:wear:1.2.0'
     implementation('com.github.lecho:hellocharts-library:1.5.8@aar')
 
-    implementation "androidx.core:core-ktx:$coreVersion"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     testImplementation "junit:junit:$junit_version"