Merge branch 'release/5.70.0' into main

Author: cmonfortep

CONTRIBUTING.md

@@ -33,7 +33,20 @@ If you have a great idea you really want to implement, start by logging an issue
 
 We care about clean code. Refer to our [style guide](styleguide/STYLEGUIDE.md).
 
-
 ### Commit Messages
 
+See Chris Beams' guide to writing good commit messages https://chris.beams.io/posts/git-commit/
+
+### Why is a build failing?
+
+Bitrise as a our CI environment, [all builds can be seen here](https://app.bitrise.io/app/dc22e377b9a9ccbf#/builds).
+We use [Spotless](https://github.com/diffplug/spotless) as a code formatter, and every build in Bitrise will trigger a check for several rules.
+If your PR is failing because of that, please make sure that you have our [style guide](styleguide/STYLEGUIDE.md) imported and the code formatted.
+You can also trigger an automatic code formatting of the code by executing:
+
+```
+./gradleW app:spotlessApply
+```
+
+
 See Chris Beams' guide to writing good commit messages https://chris.beams.io/posts/git-commit/

app/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
-apply from: "$rootDir/ktlint.gradle"
+apply from: "$rootDir/spotless.gradle"
 
 ext {
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
@@ -96,23 +96,23 @@ android {
 }
 
 ext {
-    androidX = "1.2.0-beta01"
-    materialDesign = "1.2.0-alpha05"
-    swipeRefreshLayout = "1.0.0"
+    androidX = "1.2.0"
+    materialDesign = "1.2.1"
+    swipeRefreshLayout = "1.1.0"
     architectureComponents = "1.1.1"
     architectureComponentsExtensions = "1.1.1"
-    androidKtxCore = "1.2.0"
-    fragmentKtx = "1.2.3"
-    constraintLayout = "2.0.0-beta4"
+    androidKtxCore = "1.3.2"
+    fragmentKtx = "1.2.5"
+    constraintLayout = "2.0.4"
     lifecycle = "2.2.0"
     room = "2.2.5"
-    workManager = "2.3.4"
+    workManager = "2.4.0"
     legacySupport = "1.0.0"
     coreTesting = "2.1.0"
-    testRunner = "1.2.0"
+    testRunner = "1.3.0"
     coroutines = "1.3.5"
     retrofitCoroutinesAdapter = "0.9.2"
-    webkit = "1.2.0"
+    webkit = "1.3.0"
     referrerLibrary = "1.1.2"
 
     junit = "4.12"
@@ -126,9 +126,9 @@ ext {
     rxAndroid = "2.0.2"
     timber = "4.7.1"
     rxRelay = "2.0.0"
-    leakCanary = "2.0"
-    mockito = "2.18.3"
-    mockitoKotlin = "2.0.0"
+    leakCanary = "2.5"
+    mockito = "3.4.6"
+    mockitoKotlin = "2.2.0"
     commonsMath = "3.6.1"
 }
 
@@ -213,18 +213,11 @@ dependencies {
     implementation("com.android.installreferrer:installreferrer:$referrerLibrary")
 
     // Testing dependencies
-    testImplementation "org.mockito:mockito-core:$mockito"
-    testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
-    testImplementation "junit:junit:$junit"
-
     androidTestImplementation "androidx.test:runner:$testRunner"
     androidTestImplementation "androidx.test:rules:$testRunner"
     androidTestUtil "androidx.test:orchestrator:$testRunner"
     androidTestImplementation "org.mockito:mockito-android:$mockito"
-    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okHttp"
     androidTestImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlin"
+    androidTestImplementation "com.squareup.okhttp3:mockwebserver:$okHttp"
     androidTestImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-
-    kapt "com.android.tools.build.jetifier:jetifier-core:$jetifier"
-    annotationProcessor "com.android.tools.build.jetifier:jetifier-core:$jetifier"
 }