From 6e5fa4e27c1a973c24f3d350410cbf16e551d38c Mon Sep 17 00:00:00 2001 From: CherryPerry Date: Wed, 15 May 2024 12:54:56 +0100 Subject: [PATCH 1/5] Sync ChildAwareExt generics with ChildAware --- .../kotlin/com/bumble/appyx/core/children/ChildAwareExt.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libraries/core/src/main/kotlin/com/bumble/appyx/core/children/ChildAwareExt.kt b/libraries/core/src/main/kotlin/com/bumble/appyx/core/children/ChildAwareExt.kt index c2d6a6183..2213d8493 100644 --- a/libraries/core/src/main/kotlin/com/bumble/appyx/core/children/ChildAwareExt.kt +++ b/libraries/core/src/main/kotlin/com/bumble/appyx/core/children/ChildAwareExt.kt @@ -1,14 +1,12 @@ package com.bumble.appyx.core.children -import com.bumble.appyx.core.node.Node - -inline fun ChildAware<*>.whenChildAttached( +inline fun ChildAware<*>.whenChildAttached( noinline callback: ChildCallback, ) { whenChildAttached(T::class, callback) } -inline fun ChildAware<*>.whenChildrenAttached( +inline fun ChildAware<*>.whenChildrenAttached( noinline callback: ChildrenCallback, ) { whenChildrenAttached(T1::class, T2::class, callback) From 4cc75662d014ebb2533d2a4c7cc6c154dd4b1440 Mon Sep 17 00:00:00 2001 From: CherryPerry Date: Wed, 15 May 2024 12:57:56 +0100 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08d337d79..4d41e6480 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Pending changes +- [#705](https://github.com/bumble-tech/appyx/pull/705) – **Fixed**: ChildAware extension functions now allow Any type as a parameter + --- ## 1.5.0 From 7feab6c1166acb457368ce392437ec17a02fe2fd Mon Sep 17 00:00:00 2001 From: CherryPerry Date: Wed, 15 May 2024 15:40:17 +0100 Subject: [PATCH 3/5] Use ubuntu-latest for instrumentation tests --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5057431c9..394bd2166 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: instrumentation-tests: name: Instrumentation tests - runs-on: macOS-latest + runs-on: ubuntu-latest timeout-minutes: 30 steps: - uses: actions/checkout@v4 From 895bdad8c6c2ad3c4e4fd71eae11a379cc949d2b Mon Sep 17 00:00:00 2001 From: CherryPerry Date: Wed, 15 May 2024 15:59:14 +0100 Subject: [PATCH 4/5] Add test package removal --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 394bd2166..65133c72c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,6 +119,7 @@ jobs: emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none disable-animations: true script: | + adb shell pm list packages -3 | cut -f 2 -d ":" | while read package; do if [ "$package" = "com.bumble.appyx.sample.navigation.compose.test" ] || [ "$package" = "com.bumble.appyx.core.test" ] || [ "$package" = "com.bumble.appyx.interop.ribs.test" ]; then adb uninstall $package; fi; done adb logcat > logcat.out & ./gradlew connectedCheck - name: Upload failed instrumentation artifacts @@ -139,4 +140,4 @@ jobs: with: python-version: '3.x' - run: pip install mkdocs-material - - run: mkdocs build --strict + - run: mkdocs build --strict \ No newline at end of file From 3addcd28e44f34334270a0af27ceff6bd890254a Mon Sep 17 00:00:00 2001 From: CherryPerry Date: Wed, 15 May 2024 16:20:29 +0100 Subject: [PATCH 5/5] Add more exclusions --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 65133c72c..b60563577 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -119,7 +119,7 @@ jobs: emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none disable-animations: true script: | - adb shell pm list packages -3 | cut -f 2 -d ":" | while read package; do if [ "$package" = "com.bumble.appyx.sample.navigation.compose.test" ] || [ "$package" = "com.bumble.appyx.core.test" ] || [ "$package" = "com.bumble.appyx.interop.ribs.test" ]; then adb uninstall $package; fi; done + adb shell pm list packages -3 | cut -f 2 -d ":" | while read package; do if [ "$package" = "com.bumble.appyx.sample.navigation.compose.test" ] || [ "$package" = "com.bumble.appyx.core.test" ] || [ "$package" = "com.bumble.appyx.interop.ribs.test" ] || [ "$package" = "com.bumble.appyx.sample.navigtion.compose.test" ]; then adb uninstall $package; fi; done adb logcat > logcat.out & ./gradlew connectedCheck - name: Upload failed instrumentation artifacts