From 5ef79148bdfc84edc0c33257fadb8b21c0b95171 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Thu, 6 May 2021 08:52:26 +0100 Subject: [PATCH] Updated dependencies and gradle version --- app/build.gradle | 3 +-- build.gradle | 15 +++++++-------- core/build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b797b99e..94afb3d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,7 +42,6 @@ android { buildFeatures { viewBinding = true } - kotlinOptions.useIR = true } dependencies { @@ -68,7 +67,7 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation "org.mockito:mockito-core:$mockito_version" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" androidTestImplementation "org.mockito:mockito-android:$mockito_version" debugImplementation "com.squareup.leakcanary:leakcanary-android:$leak_canary_version" } diff --git a/build.gradle b/build.gradle index cccb5c7c..ecee18cc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,26 +1,25 @@ buildscript { ext { - gradle_version = '4.1.3' - kotlin_version = '1.4.32' - coroutines_version = '1.4.3' + gradle_version = '4.2.0' + kotlin_version = '1.5.0' + coroutines_version = '1.5.0-RC-native-mt' material_version = '1.3.0' constraint_layout_version = '2.0.4' lifecycle_version = '2.3.1' navigation_version = '2.3.5' preference_version = '1.1.1' room_version = '2.3.0' - hilt_version = '2.33-beta' + hilt_version = '2.35.1' retrofit_version = '2.9.0' osmdroid_version = '6.1.10' timber_version = '4.7.1' junit_version = '4.13.2' mockito_version = '3.9.0' - coroutines_test_version = '1.3.2' - leak_canary_version = '2.5' + leak_canary_version = '2.7' } repositories { google() - jcenter() + mavenCentral() } dependencies { classpath "com.android.tools.build:gradle:$gradle_version" @@ -32,7 +31,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/core/build.gradle b/core/build.gradle index 4f3eb590..833913ef 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -14,5 +14,5 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation "org.mockito:mockito-core:$mockito_version" - testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_test_version" + testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0fb0dad1..5aad41ea 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip