diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 828651f..ead87ff 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -8,7 +8,7 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: set up JDK 11 uses: actions/setup-java@v1 with: @@ -39,10 +39,17 @@ jobs: androidTest: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v2 + + - name: Set up JDK 11 + uses: actions/setup-java@v1 + with: + java-version: 11 + - name: Instrumentation Tests uses: reactivecircus/android-emulator-runner@v2 with: - api-level: 28 + api-level: 29 target: google_apis script: ./gradlew connectedAndroidTest \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 25abfe2..76fcadb 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -53,18 +53,6 @@ android { } } -tasks.withType { - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - freeCompilerArgs = listOf( - "-Xallow-jvm-ir-dependencies", "-Xskip-prerelease-check", - "-Xuse-experimental=kotlinx.coroutines.ExperimentalCoroutinesApi", - "-P", - "plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true" - ) - } -} - dependencies { with(Deps.Android) { implementation(material) diff --git a/app/src/androidTest/java/com/surrus/peopleinspace/PeopleInSpaceRepositoryFake.kt b/app/src/androidTest/java/com/surrus/peopleinspace/PeopleInSpaceRepositoryFake.kt index 5097af8..989441b 100644 --- a/app/src/androidTest/java/com/surrus/peopleinspace/PeopleInSpaceRepositoryFake.kt +++ b/app/src/androidTest/java/com/surrus/peopleinspace/PeopleInSpaceRepositoryFake.kt @@ -19,4 +19,8 @@ class PeopleInSpaceRepositoryFake: PeopleInSpaceRepositoryInterface { override fun pollISSPosition(): Flow { return flowOf(issPosition) } + + override suspend fun fetchPeople(): List { + return emptyList() + } }