Merge branch 'main' into rick/libs_versions_toml

* main:
  Drops com.android.tools:desugar_jdk_libs
  Drops AVD 21, bumps 27 to 29

# Conflicts:
#	buildSrc/src/main/java/Dependencies.kt
#	samples/dungeon/app/build.gradle.kts

Author: RBusarow

.github/workflows/kotlin.yml

@@ -63,8 +63,9 @@ jobs:
       fail-fast: false
       matrix:
         api-level:
-          - 21
-          - 24
+          - 29
+      # Unclear that older versions actually honor command to disable animation.
+      # Newer versions are reputed to be too slow: https://github.com/ReactiveCircus/android-emulator-runner/issues/222
     steps:
       - uses: actions/checkout@v2
       - name: set up JDK 11.0.7

gradle/libs.versions.toml

@@ -88,7 +88,6 @@ ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint" }
 mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-publish" }
 
 [libraries]
-android-desugar = "com.android.tools:desugar_jdk_libs:1.1.5"
 
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "androidTools" }
 

samples/dungeon/app/build.gradle.kts

@@ -13,17 +13,9 @@ android {
 
     testInstrumentationRunner = "com.squareup.sample.dungeon.DungeonTestRunner"
   }
-
-  compileOptions {
-    // Required for SnakeYAML.
-    isCoreLibraryDesugaringEnabled = true
-  }
 }
 
 dependencies {
-  // Required for SnakeYAML.
-  "coreLibraryDesugaring"(libs.android.desugar)
-
   debugImplementation(libs.squareup.leakcanary.android)
 
   implementation(project(":samples:dungeon:common"))