update libs
This commit is contained in:
parent
ff91ebb994
commit
057d072e89
|
@ -3,19 +3,19 @@
|
||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
ext {
|
||||||
kotlin_version = '1.6.0'
|
kotlin_version = '1.6.0'
|
||||||
coreVersion = '1.6.0'
|
coreVersion = '1.7.0'
|
||||||
rxjava_version = '2.2.21'
|
rxjava_version = '2.2.21'
|
||||||
rxandroid_version = '2.1.1'
|
rxandroid_version = '2.1.1'
|
||||||
rxkotlin_version = '2.4.0'
|
rxkotlin_version = '2.4.0'
|
||||||
room_version = '2.3.0'
|
room_version = '2.3.0'
|
||||||
lifecycle_version = '2.3.1'
|
lifecycle_version = '2.4.0'
|
||||||
dagger_version = '2.40.5'
|
dagger_version = '2.40.5'
|
||||||
coroutinesVersion = '1.4.1'
|
coroutinesVersion = '1.4.1'
|
||||||
activityVersion = '1.3.1'
|
activityVersion = '1.3.1'
|
||||||
fragmentktx_version = '1.3.6'
|
fragmentktx_version = '1.3.6'
|
||||||
ormLiteVersion = '4.46'
|
ormLiteVersion = '4.46'
|
||||||
nav_version = '2.3.5'
|
nav_version = '2.3.5'
|
||||||
appcompat_version = '1.3.1'
|
appcompat_version = '1.4.0'
|
||||||
material_version = '1.4.0'
|
material_version = '1.4.0'
|
||||||
constraintlayout_version = '2.1.0'
|
constraintlayout_version = '2.1.0'
|
||||||
preferencektx_version = '1.1.1'
|
preferencektx_version = '1.1.1'
|
||||||
|
@ -30,7 +30,7 @@ buildscript {
|
||||||
dexmakerVersion = "1.2"
|
dexmakerVersion = "1.2"
|
||||||
retrofit2Version = '2.9.0'
|
retrofit2Version = '2.9.0'
|
||||||
okhttp3Version = '4.9.0'
|
okhttp3Version = '4.9.0'
|
||||||
byteBuddyVersion = '1.12.0'
|
byteBuddyVersion = '1.12.3'
|
||||||
|
|
||||||
androidx_junit = '1.1.2'
|
androidx_junit = '1.1.2'
|
||||||
androidx_rules = '1.4.0-alpha04'
|
androidx_rules = '1.4.0-alpha04'
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 30
|
compileSdkVersion 31
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 28
|
minSdkVersion 28
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package info.nightscout.shared.di
|
package info.nightscout.shared.di
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.preference.PreferenceManager
|
import androidx.preference.PreferenceManager
|
||||||
import dagger.Module
|
import dagger.Module
|
||||||
import dagger.Provides
|
import dagger.Provides
|
||||||
import info.nightscout.shared.logging.AAPSLogger
|
import info.nightscout.shared.logging.AAPSLogger
|
||||||
|
|
|
@ -118,9 +118,12 @@ dependencies {
|
||||||
|
|
||||||
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
implementation fileTree(include: ['*.jar'], dir: 'libs')
|
||||||
|
|
||||||
|
implementation "androidx.core:core-ktx:$coreVersion"
|
||||||
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
implementation "androidx.appcompat:appcompat:$appcompat_version"
|
||||||
implementation 'androidx.legacy:legacy-support-v13:1.0.0'
|
|
||||||
implementation "androidx.preference:preference-ktx:$preferencektx_version"
|
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}"
|
compileOnly "com.google.android.wearable:wearable:${wearableVersion}"
|
||||||
|
@ -128,11 +131,8 @@ dependencies {
|
||||||
implementation "com.google.android.gms:play-services-wearable:${playServicesWearable}"
|
implementation "com.google.android.gms:play-services-wearable:${playServicesWearable}"
|
||||||
implementation(name: 'ustwo-clockwise-debug', ext: 'aar')
|
implementation(name: 'ustwo-clockwise-debug', ext: 'aar')
|
||||||
implementation(name: 'wearpreferenceactivity-0.5.0', 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('com.github.lecho:hellocharts-library:1.5.8@aar')
|
||||||
|
|
||||||
implementation "androidx.core:core-ktx:$coreVersion"
|
|
||||||
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
||||||
|
|
||||||
testImplementation "junit:junit:$junit_version"
|
testImplementation "junit:junit:$junit_version"
|
||||||
|
|
Loading…
Reference in a new issue