Merge remote-tracking branch 'origin/develop' into develop

Author: smelfungus

andcolorpicker/build.gradle

@@ -36,7 +36,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
   implementation "androidx.appcompat:appcompat:1.3.0-rc01"
-  implementation "androidx.core:core-ktx:1.6.0-alpha01"
+  implementation "androidx.core:core-ktx:1.6.0-alpha02"
   implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
   testImplementation "junit:junit:4.13.2"

app/build.gradle

@@ -51,9 +51,9 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation "androidx.appcompat:appcompat:1.3.0-rc01"
 
-  implementation "androidx.core:core-ktx:1.6.0-alpha01"
+  implementation "androidx.core:core-ktx:1.6.0-alpha02"
 
-  implementation "androidx.recyclerview:recyclerview:1.2.0-rc01"
+  implementation "androidx.recyclerview:recyclerview:1.2.0"
   implementation "androidx.annotation:annotation:1.2.0"
   implementation "androidx.fragment:fragment-ktx:1.3.2"
   implementation "androidx.constraintlayout:constraintlayout:2.0.4"
@@ -64,8 +64,8 @@ dependencies {
   implementation "com.mikepenz:material-design-icons-dx-typeface:5.0.1.2-kotlin@aar"
   implementation "com.mikepenz:fontawesome-typeface:5.9.0.2-kotlin@aar"
 
-  implementation "com.mikepenz:fastadapter:5.3.5"
-  implementation "com.mikepenz:fastadapter-extensions-diff:5.3.5"
+  implementation "com.mikepenz:fastadapter:5.4.0"
+  implementation "com.mikepenz:fastadapter-extensions-diff:5.4.1"
 
   implementation "com.google.android.gms:play-services-oss-licenses:17.0.0"
 

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "com.android.tools.build:gradle:3.6.3"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.google.android.gms:oss-licenses-plugin:0.10.2"
+        classpath "com.google.android.gms:oss-licenses-plugin:0.10.4"
         classpath "com.novoda:bintray-release:0.9.2"
     }
 }

integrationapp/build.gradle

@@ -43,7 +43,7 @@ dependencies {
 
   implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
   implementation "androidx.appcompat:appcompat:1.3.0-rc01"
-  implementation "androidx.core:core-ktx:1.6.0-alpha01"
+  implementation "androidx.core:core-ktx:1.6.0-alpha02"
   implementation "androidx.constraintlayout:constraintlayout:2.0.4"
 
   testImplementation "junit:junit:4.13.2"