Skip to content

Commit 38fe6f6

Browse files
committed
Enable Unified gradle test runner and run tests with Unified gradle test runner without android-emulator-runner.
1 parent de1b276 commit 38fe6f6

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,8 @@ jobs:
208208
script: echo "Generated AVD snapshot for caching."
209209

210210
- name: Run Android instrumented tests
211-
uses: reactivecircus/android-emulator-runner@v2
212-
with:
213-
api-level: 23
214-
arch: x86
215-
profile: Nexus 5X
216-
force-avd-creation: false
217-
emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
218-
script: ./gradlew connectedCheck
211+
run: |
212+
./gradlew ui-home:pixel2api28DebugAndroidTest
219213
220214
publish-to-play-store:
221215
name: Publish to Play Store

buildSrc/src/main/kotlin/io/github/reactivecircus/streamlined/BaselineProjectConfigs.kt

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package io.github.reactivecircus.streamlined
22

3+
import com.android.build.api.dsl.Device
4+
import com.android.build.api.dsl.ManagedVirtualDevice
35
import com.android.build.api.extension.ApplicationAndroidComponentsExtension
46
import com.android.build.api.extension.LibraryAndroidComponentsExtension
57
import com.android.build.gradle.TestedExtension
68
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
79
import java.io.File
10+
import org.gradle.api.ExtensiblePolymorphicDomainObjectContainer
811
import org.gradle.api.JavaVersion
912
import org.gradle.api.Project
1013
import org.gradle.api.tasks.testing.Test
1114
import org.gradle.api.tasks.testing.logging.TestLogEvent
15+
import org.gradle.kotlin.dsl.register
1216
import org.gradle.kotlin.dsl.repositories
1317
import org.gradle.kotlin.dsl.withType
1418
import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper
@@ -57,10 +61,18 @@ internal fun TestedExtension.configureCommonAndroidOptions() {
5761
resourceConfigurations.add("en")
5862
}
5963

60-
testOptions.animationsDisabled = true
61-
6264
// TODO re-enable once lint analysis failure is fixed
6365
lintOptions.disable("DialogFragmentCallbacksDetector")
66+
67+
testOptions {
68+
animationsDisabled = true
69+
devices.register<ManagedVirtualDevice>("pixel2api28") {
70+
device = "Pixel 2"
71+
apiLevel = 28
72+
systemImageSource = "aosp"
73+
abi = "x86"
74+
}
75+
}
6476
}
6577

6678
/**

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,6 @@ android.defaults.buildfeatures.renderscript=false
4343
android.defaults.buildfeatures.resvalues=false
4444
android.defaults.buildfeatures.shaders=false
4545
android.library.defaults.buildfeatures.androidresources=false
46+
47+
# Enable Gradle managed virtual devices
48+
android.experimental.androidTest.useUnifiedTestPlatform=true

0 commit comments

Comments
 (0)