From e524a62b77fe9e1466ffb47ecf424418c3a82cf3 Mon Sep 17 00:00:00 2001 From: Arty Bishop Date: Tue, 24 Nov 2020 14:34:44 +0000 Subject: [PATCH] Libs and gradle wrapper update, build.gradle cleanup --- app/build.gradle | 7 ------- build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 95e3042e..e788ee84 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,7 +21,6 @@ plugins { id "com.android.application" id "kotlin-android" id "kotlin-kapt" - id "kotlin-android-extensions" id "dagger.hilt.android.plugin" } @@ -35,7 +34,6 @@ android { targetSdkVersion 30 versionCode 18 versionName "1.4.8" - resConfigs "en", "ru" } buildTypes { @@ -49,11 +47,6 @@ android { } } - configurations { - all { - exclude module: "commons-logging" - } - } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/build.gradle b/build.gradle index 1403ec36..6d1a22c5 100644 --- a/build.gradle +++ b/build.gradle @@ -20,14 +20,14 @@ buildscript { ext { gradle_version = '4.1.1' - gradle_plugin_version = '1.4.10' + gradle_plugin_version = '1.4.20' material_version = '1.2.1' constraint_layout_version = '2.0.4' navigation_version = '2.3.1' preference_version = '1.1.1' view_pager2_version = '1.0.0' room_version = '2.2.5' - hilt_version = '2.29.1-alpha' + hilt_version = '2.30-alpha' hilt_viewmodel_version = '1.0.0-alpha02' retrofit_version = '2.9.0' osmdroid_version = '6.1.8' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f3bbd5ae..b985a72f 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.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip