diff --git a/build.gradle b/build.gradle index d95f882706..19d420b6d7 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.5.10' + kotlin_version = '1.5.21' coreVersion = '1.6.0' rxjava_version = '2.2.21' rxandroid_version = '2.1.1' @@ -11,13 +11,13 @@ buildscript { lifecycle_version = '2.3.1' dagger_version = '2.38.1' coroutinesVersion = '1.4.1' - activityVersion = '1.2.0' - fragmentktx_version = '1.3.0' + activityVersion = '1.3.1' + fragmentktx_version = '1.3.6' ormLiteVersion = '4.46' - nav_version = '2.3.3' - appcompat_version = '1.3.0' - material_version = '1.3.0' - constraintlayout_version = '2.0.4' + nav_version = '2.3.5' + appcompat_version = '1.3.1' + material_version = '1.4.0' + constraintlayout_version = '2.1.0' preferencektx_version = '1.1.1' commonslang3_version = '3.11' commonscodec_version = '1.15' @@ -30,7 +30,7 @@ buildscript { dexmakerVersion = "1.2" retrofit2Version = '2.9.0' okhttp3Version = '4.9.0' - byteBuddyVersion = '1.11.5' + byteBuddyVersion = '1.11.12' androidx_junit = '1.1.2' androidx_rules = '1.4.0-alpha04' @@ -42,7 +42,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:7.0.0' - classpath 'com.google.gms:google-services:4.3.8' + classpath 'com.google.gms:google-services:4.3.10' classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle index 8e261738bb..aa285737bb 100644 --- a/core/core_dependencies.gradle +++ b/core/core_dependencies.gradle @@ -15,7 +15,7 @@ dependencies { api "androidx.activity:activity-ktx:${activityVersion}" api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" api 'androidx.cardview:cardview:1.0.0' - api 'androidx.recyclerview:recyclerview:1.1.0' + api 'androidx.recyclerview:recyclerview:1.2.1' api 'androidx.gridlayout:gridlayout:1.0.0' api 'androidx.percentlayout:percentlayout:1.0.0' api "com.google.android.material:material:$material_version" @@ -55,7 +55,7 @@ dependencies { api "com.j256.ormlite:ormlite-android:${ormLiteVersion}" // pumpCommon - api "com.google.code.gson:gson:2.8.6" + api "com.google.code.gson:gson:2.8.7" // don't kill my app api('dev.doubledot.doki:library:0.0.1@aar') { @@ -103,5 +103,6 @@ dependencies { api "commons-codec:commons-codec:$commonscodec_version" // Phone checker + // updating to 0.0.9 prevents AAPS from build api 'com.scottyab:rootbeer-lib:0.0.8' } \ No newline at end of file diff --git a/gradle/test_dependencies.gradle b/gradle/test_dependencies.gradle index 059f92d2a7..8f64082505 100644 --- a/gradle/test_dependencies.gradle +++ b/gradle/test_dependencies.gradle @@ -1,19 +1,19 @@ dependencies { testImplementation "junit:junit:$junit_version" - testImplementation 'org.json:json:20201115' + testImplementation 'org.json:json:20210307' testImplementation "org.mockito:mockito-core:${mockitoVersion}" testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4-rule:${powermockVersion}" testImplementation "org.powermock:powermock-module-junit4:${powermockVersion}" testImplementation "joda-time:joda-time:$jodatime_version" - testImplementation('com.google.truth:truth:1.1.2') { + testImplementation('com.google.truth:truth:1.1.3') { exclude group: "com.google.guava", module: "guava" } testImplementation "org.skyscreamer:jsonassert:1.5.0" testImplementation "org.hamcrest:hamcrest-all:1.3" - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0-alpha04' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation "androidx.test.ext:junit:$androidx_junit" androidTestImplementation "androidx.test:rules:$androidx_rules"