From b8d4f366e0a3794ad46f6ae292f327ef2d42c718 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 19:20:46 +0200 Subject: [PATCH 01/23] Update Kotlin and KSP --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5e436204..56d3cac4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle androidGradlePlugin = "8.3.2" # https://github.com/JetBrains/kotlin/releases -kotlin = "1.9.22" +kotlin = "1.9.23" # https://dagger.dev/hilt/gradle-setup hilt = "2.51.1" # https://github.com/protocolbuffers/protobuf/releases @@ -54,7 +54,7 @@ chucker = "4.0.0" # https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md desugar = "2.0.4" # https://github.com/google/ksp/releases -kspPlugin = "1.9.22-1.0.17" +kspPlugin = "1.9.23-1.0.20" # https://developer.android.com/jetpack/androidx/releases/sharetarget shareTarget = "1.2.0" # https://github.com/KasperskyLab/Kaspresso/releases From 92a6ff3df51e19ecd6a7b7e600f2b740692eb2b1 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 19:23:18 +0200 Subject: [PATCH 02/23] Downgrade Kaspresso to last released --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 56d3cac4..6e5a85f8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -58,7 +58,7 @@ kspPlugin = "1.9.23-1.0.20" # https://developer.android.com/jetpack/androidx/releases/sharetarget shareTarget = "1.2.0" # https://github.com/KasperskyLab/Kaspresso/releases -kaspresso = "1.5.5" +kaspresso = "1.5.4" # https://developer.android.com/jetpack/androidx/releases/test androidXTestCore = "1.5.0" androidXTestRules = "1.5.0" From 5b5612a97dfcff9c9f964e25e353da575a333d36 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 19:26:20 +0200 Subject: [PATCH 03/23] Update Compose compiler extension --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6e5a85f8..b76a44db 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -68,7 +68,7 @@ junitKtx = "1.1.5" # https://mvnrepository.com/artifact/androidx.compose/compose-bom composeBom = "2024.03.00" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin -composeKotlinCompilerExtension = "1.5.9" +composeKotlinCompilerExtension = "1.5.13" # https://google.github.io/accompanist/ accompanistVersion = "0.34.0" # https://developer.android.com/jetpack/androidx/releases/compose-material From 243f6645cfda44978bd37bb81b5fde3811181683 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 19:34:14 +0200 Subject: [PATCH 04/23] Fix flaky UI test --- .../kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt b/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt index 1821d162..5a3a5175 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt +++ b/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt @@ -58,8 +58,14 @@ class FirstSetUpTest : BaseTestCase() { assertIsNotEnabled() } - okayButtonText { - assertTextContains(getResourceString(R.string.fragment_disclaimer_button_okay)) + flakySafely(5_000) { + okayButton { + assertIsEnabled() + } + + okayButtonText { + assertTextContains(getResourceString(R.string.fragment_disclaimer_button_okay)) + } } disclaimerText { From 54887a5e450ee388c3801716a5c6c1560988f541 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 19:53:14 +0200 Subject: [PATCH 05/23] Update AGP version --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b76a44db..0ae401ed 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] # https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle -androidGradlePlugin = "8.3.2" +androidGradlePlugin = "8.4.0" # https://github.com/JetBrains/kotlin/releases kotlin = "1.9.23" # https://dagger.dev/hilt/gradle-setup From a4cb747daf3735f43ec714c063757f47f41597d3 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 20:43:16 +0200 Subject: [PATCH 06/23] Fix flakySafely scope --- .../kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt | 13 +++++++------ .../mealient/ui/disclaimer/DisclaimerViewModel.kt | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt b/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt index 5a3a5175..e9eb09de 100644 --- a/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt +++ b/app/src/androidTest/kotlin/gq/kirmanak/mealient/FirstSetUpTest.kt @@ -5,6 +5,7 @@ import gq.kirmanak.mealient.screen.AuthenticationScreen import gq.kirmanak.mealient.screen.BaseUrlScreen import gq.kirmanak.mealient.screen.DisclaimerScreen import gq.kirmanak.mealient.screen.RecipesListScreen +import gq.kirmanak.mealient.ui.disclaimer.DisclaimerViewModel import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen import io.github.kakaocup.kakao.common.utilities.getResourceString import org.junit.Before @@ -58,16 +59,16 @@ class FirstSetUpTest : BaseTestCase() { assertIsNotEnabled() } - flakySafely(5_000) { - okayButton { - assertIsEnabled() - } - - okayButtonText { + okayButtonText { + flakySafely(DisclaimerViewModel.FULL_COUNT_DOWN_SEC * 1_000L) { assertTextContains(getResourceString(R.string.fragment_disclaimer_button_okay)) } } + okayButton { + assertIsEnabled() + } + disclaimerText { assertTextEquals(getResourceString(R.string.fragment_disclaimer_main_text)) } diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt b/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt index 53d407b9..c6b4ddc2 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/disclaimer/DisclaimerViewModel.kt @@ -85,7 +85,7 @@ internal class DisclaimerViewModel @Inject constructor( } companion object { - private const val FULL_COUNT_DOWN_SEC = 5 + const val FULL_COUNT_DOWN_SEC = 5 private const val COUNT_DOWN_TICK_PERIOD_SEC = 1 } } \ No newline at end of file From 9003c37315f253835f3788ab2fecd402fa5522be Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 21:01:52 +0200 Subject: [PATCH 07/23] Fix missing system image for UI tests --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 362254da..b52ebc88 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,7 +68,7 @@ android { maybeCreate("pixel2api30").apply { device = "Pixel 2" apiLevel = 30 - systemImageSource = "aosp-atd" + systemImageSource = "aosp" } } } From 4b4b3cace23aedcec97690a0c2a15509b178b56e Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 21:20:18 +0200 Subject: [PATCH 08/23] Use Intel MacOS to run UI tests --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 17b6ad7c..3c5ad8bf 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -41,7 +41,7 @@ jobs: report_paths: './**/build/test-results/**/TEST-*.xml' uiTests: - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v4 with: From 8d6ba7062bc21794d422f992c19d5ea5d45c5c77 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Tue, 7 May 2024 21:54:49 +0200 Subject: [PATCH 09/23] Revert "Fix missing system image for UI tests" This reverts commit 9003c37315f253835f3788ab2fecd402fa5522be. --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b52ebc88..362254da 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,7 +68,7 @@ android { maybeCreate("pixel2api30").apply { device = "Pixel 2" apiLevel = 30 - systemImageSource = "aosp" + systemImageSource = "aosp-atd" } } } From 0228cc77af6b1b804d2bfecc764b6e86911d7316 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Wed, 8 May 2024 19:34:23 +0200 Subject: [PATCH 10/23] Update test device API level to 34 --- app/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 362254da..f9917e63 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -65,9 +65,9 @@ android { testOptions { managedDevices { devices { - maybeCreate("pixel2api30").apply { - device = "Pixel 2" - apiLevel = 30 + maybeCreate("mediumPhoneApi34").apply { + device = "Medium Phone" + apiLevel = 34 systemImageSource = "aosp-atd" } } From 529d8d5107a280a85d19a7b8a93b789cdd8d58b8 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Wed, 8 May 2024 19:42:18 +0200 Subject: [PATCH 11/23] Use google-atd system image source --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f9917e63..68635992 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -68,7 +68,7 @@ android { maybeCreate("mediumPhoneApi34").apply { device = "Medium Phone" apiLevel = 34 - systemImageSource = "aosp-atd" + systemImageSource = "google-atd" } } } From fb8e6cf30e78f83c1b73d440493a37801efca2df Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Wed, 8 May 2024 19:53:13 +0200 Subject: [PATCH 12/23] Update managed devices declaration syntax --- app/build.gradle.kts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 68635992..b88052d6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,5 @@ @file:Suppress("UnstableApiUsage") -import com.android.build.api.dsl.ManagedVirtualDevice import java.io.FileInputStream import java.util.Properties @@ -64,11 +63,11 @@ android { testOptions { managedDevices { - devices { - maybeCreate("mediumPhoneApi34").apply { + localDevices { + create("mediumPhoneApi34") { device = "Medium Phone" apiLevel = 34 - systemImageSource = "google-atd" + systemImageSource = "aosp-atd" } } } From 8ff3253923ceb81998ff4f1941f2866a6a130ffe Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Wed, 8 May 2024 20:30:55 +0200 Subject: [PATCH 13/23] Use device and syntax from now in android app --- app/build.gradle.kts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index b88052d6..5ebf4890 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,6 @@ @file:Suppress("UnstableApiUsage") +import com.android.build.api.dsl.ManagedVirtualDevice import java.io.FileInputStream import java.util.Properties @@ -63,10 +64,10 @@ android { testOptions { managedDevices { - localDevices { - create("mediumPhoneApi34") { - device = "Medium Phone" - apiLevel = 34 + devices { + maybeCreate("pixel4Api30", ManagedVirtualDevice::class.java).apply { + device = "Pixel 4" + apiLevel = 30 systemImageSource = "aosp-atd" } } From e2a04b3f4cd2d08ce7c99a2f137cc36e5cacff0f Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Thu, 9 May 2024 09:53:40 +0200 Subject: [PATCH 14/23] Try ubuntu agent for UI tests --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3c5ad8bf..ce61e84e 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -41,7 +41,7 @@ jobs: report_paths: './**/build/test-results/**/TEST-*.xml' uiTests: - runs-on: macos-13 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 with: From 873e1908de675d741d9c2b653242d0707f394ada Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Thu, 9 May 2024 08:21:04 +0000 Subject: [PATCH 15/23] Use an actual emulator instead of GMD --- .github/workflows/check.yml | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index ce61e84e..38fdcd20 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -42,11 +42,39 @@ jobs: uiTests: runs-on: ubuntu-latest + strategy: + matrix: + api-level: [33, 34] steps: - uses: actions/checkout@v4 with: fetch-depth: 0 + - name: Enable KVM group perms + run: | + echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules + sudo udevadm control --reload-rules + sudo udevadm trigger --name-match=kvm + + - name: AVD cache + uses: actions/cache@v4 + id: avd-cache + with: + path: | + ~/.android/avd/* + ~/.android/adb* + key: avd-${{ matrix.api-level }} + + - name: create AVD and generate snapshot for caching + if: steps.avd-cache.outputs.cache-hit != 'true' + uses: reactivecircus/android-emulator-runner@v2 + with: + api-level: ${{ matrix.api-level }} + force-avd-creation: false + emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + disable-animations: false + script: echo "Generated AVD snapshot for caching." + - uses: actions/setup-java@v4 with: distribution: temurin @@ -59,4 +87,9 @@ jobs: uses: android-actions/setup-android@v3 - name: Run tests - run: ./gradlew allDevicesCheck -Pandroid.testoptions.manageddevices.emulator.gpu=swiftshader_indirect + uses: reactivecircus/android-emulator-runner@v2 + with: + api-level: ${{ matrix.api-level }} + force-avd-creation: false + emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + script: ./gradlew connectedCheck From 26b4b4a14b123b22f5960acd1f2875d21fdd1a65 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Thu, 9 May 2024 08:24:48 +0000 Subject: [PATCH 16/23] Use only one API level 30 --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 38fdcd20..c0a97197 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - api-level: [33, 34] + api-level: [30] steps: - uses: actions/checkout@v4 with: From fe6931e30a3f39470ceae423bab1f8f542bfbc7c Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Thu, 9 May 2024 08:28:03 +0000 Subject: [PATCH 17/23] Remove Android SDK setup action --- .github/workflows/check.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c0a97197..138157a6 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -83,9 +83,6 @@ jobs: - name: Setup Gradle uses: gradle/gradle-build-action@v3 - - name: Setup Android SDK - uses: android-actions/setup-android@v3 - - name: Run tests uses: reactivecircus/android-emulator-runner@v2 with: From 6d5e93e58b2443781b2d727b52b3688d6abf0354 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Thu, 9 May 2024 08:30:23 +0000 Subject: [PATCH 18/23] Setup Gradle before AVD --- .github/workflows/check.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 138157a6..3fe78092 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -50,6 +50,14 @@ jobs: with: fetch-depth: 0 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 + - name: Enable KVM group perms run: | echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules @@ -75,14 +83,6 @@ jobs: disable-animations: false script: echo "Generated AVD snapshot for caching." - - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 17 - - - name: Setup Gradle - uses: gradle/gradle-build-action@v3 - - name: Run tests uses: reactivecircus/android-emulator-runner@v2 with: From 4c135424f246f0be8025aa6621bd35abc363fc29 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Thu, 9 May 2024 08:37:48 +0000 Subject: [PATCH 19/23] Use x86_64 architecture --- .github/workflows/check.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3fe78092..39602965 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -80,7 +80,10 @@ jobs: api-level: ${{ matrix.api-level }} force-avd-creation: false emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - disable-animations: false + arch: x86_64 + disable-animations: true + disk-size: 6000M + heap-size: 600M script: echo "Generated AVD snapshot for caching." - name: Run tests @@ -89,4 +92,8 @@ jobs: api-level: ${{ matrix.api-level }} force-avd-creation: false emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none + arch: x86_64 + disable-animations: true + disk-size: 6000M + heap-size: 600M script: ./gradlew connectedCheck From 43fc88eca3e58521264553288f689ce3d06f7049 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Thu, 9 May 2024 08:38:53 +0000 Subject: [PATCH 20/23] Replace deprecated gradle setup action --- .github/workflows/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 39602965..c5b11a22 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -21,7 +21,7 @@ jobs: java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 - name: Setup Android SDK uses: android-actions/setup-android@v3 @@ -56,7 +56,7 @@ jobs: java-version: 17 - name: Setup Gradle - uses: gradle/gradle-build-action@v3 + uses: gradle/actions/setup-gradle@v3 - name: Enable KVM group perms run: | From 43a8f84060609f74b5b611e538aef097553fdc32 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 22 Jun 2024 10:11:04 +0200 Subject: [PATCH 21/23] Downgrade all dependencies again --- gradle/libs.versions.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ae401ed..334add9b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,8 +1,8 @@ [versions] # https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle -androidGradlePlugin = "8.4.0" +androidGradlePlugin = "8.3.2" # https://github.com/JetBrains/kotlin/releases -kotlin = "1.9.23" +kotlin = "1.9.22" # https://dagger.dev/hilt/gradle-setup hilt = "2.51.1" # https://github.com/protocolbuffers/protobuf/releases @@ -54,7 +54,7 @@ chucker = "4.0.0" # https://github.com/google/desugar_jdk_libs/blob/master/CHANGELOG.md desugar = "2.0.4" # https://github.com/google/ksp/releases -kspPlugin = "1.9.23-1.0.20" +kspPlugin = "1.9.22-1.0.17" # https://developer.android.com/jetpack/androidx/releases/sharetarget shareTarget = "1.2.0" # https://github.com/KasperskyLab/Kaspresso/releases @@ -68,7 +68,7 @@ junitKtx = "1.1.5" # https://mvnrepository.com/artifact/androidx.compose/compose-bom composeBom = "2024.03.00" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin -composeKotlinCompilerExtension = "1.5.13" +composeKotlinCompilerExtension = "1.5.9" # https://google.github.io/accompanist/ accompanistVersion = "0.34.0" # https://developer.android.com/jetpack/androidx/releases/compose-material From d3f415c80feb6f5c908b29782d602d2aba676fe6 Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 22 Jun 2024 10:13:58 +0200 Subject: [PATCH 22/23] Run only app android tests --- .github/workflows/check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c5b11a22..6726577d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -96,4 +96,4 @@ jobs: disable-animations: true disk-size: 6000M heap-size: 600M - script: ./gradlew connectedCheck + script: ./gradlew :app:connectedCheck From 3a5d36d2dd47b9c6844278ad3e3ec7f8536da5da Mon Sep 17 00:00:00 2001 From: Kirill Kamakin Date: Sat, 22 Jun 2024 10:18:47 +0200 Subject: [PATCH 23/23] Remove managed devices --- app/build.gradle.kts | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5ebf4890..36fecbd5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,6 +1,5 @@ @file:Suppress("UnstableApiUsage") -import com.android.build.api.dsl.ManagedVirtualDevice import java.io.FileInputStream import java.util.Properties @@ -62,17 +61,6 @@ android { execution = "ANDROIDX_TEST_ORCHESTRATOR" } - testOptions { - managedDevices { - devices { - maybeCreate("pixel4Api30", ManagedVirtualDevice::class.java).apply { - device = "Pixel 4" - apiLevel = 30 - systemImageSource = "aosp-atd" - } - } - } - } buildFeatures { buildConfig = true }