Skip to content

Commit 76b488e

Browse files
authored
Merge pull request #671 from square/ray/newer-is-always-better-am-i-right
Sacrificing some chickens to the espresso gods
2 parents fb21149 + 7919249 commit 76b488e

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

.github/workflows/kotlin.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ jobs:
6363
fail-fast: false
6464
matrix:
6565
api-level:
66-
- 21
67-
- 24
66+
- 29
67+
# Unclear that older versions actually honor command to disable animation.
68+
# Newer versions are reputed to be too slow: https://github.com/ReactiveCircus/android-emulator-runner/issues/222
6869
steps:
6970
- uses: actions/checkout@v2
7071
- name: set up JDK 11.0.7

buildSrc/src/main/java/Dependencies.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ object Dependencies {
5252
const val cycler = "com.squareup.cycler:cycler:0.1.9"
5353

5454
// Required for Dungeon Crawler sample.
55-
const val desugar_jdk_libs = "com.android.tools:desugar_jdk_libs:1.1.5"
5655
const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.8.1"
5756
const val radiography = "com.squareup.radiography:radiography:2.4.0"
5857
const val rxandroid2 = "io.reactivex.rxjava2:rxandroid:2.1.1"

samples/dungeon/app/build.gradle.kts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,9 @@ android {
1313

1414
testInstrumentationRunner = "com.squareup.sample.dungeon.DungeonTestRunner"
1515
}
16-
17-
compileOptions {
18-
// Required for SnakeYAML.
19-
isCoreLibraryDesugaringEnabled = true
20-
}
2116
}
2217

2318
dependencies {
24-
// Required for SnakeYAML.
25-
"coreLibraryDesugaring"(Dependencies.desugar_jdk_libs)
26-
2719
debugImplementation(Dependencies.leakcanary)
2820

2921
implementation(project(":samples:dungeon:common"))

0 commit comments

Comments
 (0)