From 3e92716d11eb2d511bcc10d32ebec08ef28f1c30 Mon Sep 17 00:00:00 2001 From: Mohit Ajwani Date: Fri, 17 Sep 2021 13:17:56 +0530 Subject: [PATCH] Update all library and plugin versions --- app/build.gradle | 9 ++--- build.gradle | 42 ++++++++++++------------ gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4685d84c8..1521ba44b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,14 +32,12 @@ android { debug { minifyEnabled false testCoverageEnabled true - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro' } release { minifyEnabled true - useProguard true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' testProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguardTest-rules.pro' } @@ -107,7 +105,7 @@ dependencies { kapt "androidx.room:room-compiler:$roomVersion" implementation "androidx.room:room-ktx:$roomVersion" implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion" - kapt "androidx.lifecycle:lifecycle-compiler:$archLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-common-java8:$archLifecycleVersion" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$archLifecycleVersion" implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion" implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion" @@ -136,9 +134,8 @@ dependencies { testImplementation "androidx.test.ext:junit-ktx:$androidXTestExtKotlinRunnerVersion" testImplementation "androidx.test:rules:$androidXTestRulesVersion" // Once https://issuetracker.google.com/127986458 is fixed this can be testImplementation - implementation "androidx.fragment:fragment-testing:$fragmentVersion" + testImplementation "androidx.fragment:fragment-testing:$fragmentVersion" implementation "androidx.test:core:$androidXTestCoreVersion" - implementation "androidx.fragment:fragment:$fragmentVersion" // AndroidX Test - Instrumented testing androidTestImplementation "androidx.test:core-ktx:$androidXTestCoreVersion" @@ -161,6 +158,6 @@ dependencies { androidTestImplementation "com.google.android.material:material:$materialVersion" // Kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" implementation "androidx.fragment:fragment-ktx:$fragmentKtxVersion" } diff --git a/build.gradle b/build.gradle index 64b748486..cef72466b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlinVersion = '1.3.31' - ext.navigationVersion = "2.1.0-alpha06" + ext.kotlinVersion = '1.5.30' + ext.navigationVersion = "2.4.0-alpha09" repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + classpath 'com.android.tools.build:gradle:7.0.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigationVersion" @@ -18,7 +18,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } @@ -31,32 +31,32 @@ ext { // Sdk and tools // Support library and architecture components support minSdk 14 and above. minSdkVersion = 14 - targetSdkVersion = 28 - compileSdkVersion = 28 + targetSdkVersion = 31 + compileSdkVersion = 31 // App dependencies androidXVersion = '1.0.0' - androidXTestCoreVersion = '1.2.0' - androidXTestExtKotlinRunnerVersion = '1.1.1' - androidXTestRulesVersion = '1.2.0-beta01' - androidXAnnotations = '1.0.1' + androidXTestCoreVersion = '1.3.6' + androidXTestExtKotlinRunnerVersion = '1.1.3' + androidXTestRulesVersion = '1.4.1-alpha01' + androidXAnnotations = '1.2.0' androidXLegacySupport = '1.0.0' - appCompatVersion = '1.0.2' - archLifecycleVersion = '2.1.0-rc01' - archTestingVersion = '2.0.0' + appCompatVersion = '1.3.1' + archLifecycleVersion = '2.4.0-beta01' + archTestingVersion = '2.1.0' cardVersion = '1.0.0' coroutinesVersion = '1.2.1' dexMakerVersion = '2.12.1' - espressoVersion = '3.2.0-beta01' - fragmentVersion = '1.1.0-alpha07' + espressoVersion = '3.5.0-alpha01' + fragmentVersion = '1.4.0-alpha09' fragmentKtxVersion = '1.1.0-rc01' hamcrestVersion = '1.3' - junitVersion = '4.12' - materialVersion = '1.0.0' + junitVersion = '4.13.2' + materialVersion = '1.4.0' mockitoVersion = '2.8.9' - recyclerViewVersion = '1.0.0' - robolectricVersion = '4.3-beta-1' - roomVersion = '2.1.0' + recyclerViewVersion = '1.2.1' + robolectricVersion = '4.3' + roomVersion = '2.3.0' rulesVersion = '1.0.1' timberVersion = '4.7.1' truthVersion = '0.44' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 464ed4166..a4a88920b 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-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip