Skip to content

Commit dde367c

Browse files
Merge branch 'main' into lang
2 parents 9ff5379 + dcdd006 commit dde367c

3 files changed

Lines changed: 28 additions & 6 deletions

File tree

.github/workflows/android-ci.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,14 +132,37 @@ jobs:
132132
uses: ./.github/actions/emulator-step
133133
with:
134134
api-level: ${{ matrix.api-level }}
135+
emulator-options: >
136+
-no-window
137+
-no-boot-anim
138+
-gpu swiftshader_indirect
139+
-noaudio
140+
-camera-back none
141+
-camera-front none
142+
disable-animations: true
135143
script: echo "Generated AVD snapshot for caching."
136144
- name: Build app and test APKs
137145
run: ./gradlew assembleDebug assembleDebugAndroidTest
138146
- name: Run instrumented tests
139147
uses: ./.github/actions/emulator-step
140148
with:
141149
api-level: ${{ matrix.api-level }}
142-
script: ./gradlew connectedDebugAndroidTest -x assembleDebug -x assembleDebugAndroidTest
150+
emulator-options: >
151+
-no-window
152+
-no-boot-anim
153+
-gpu swiftshader_indirect
154+
-noaudio
155+
-camera-back none
156+
-camera-front none
157+
disable-animations: true
158+
script: |
159+
adb wait-for-device
160+
# Wait until Android system UI is fully ready
161+
until adb shell getprop sys.boot_completed | grep -m 1 "1"; do sleep 2; done
162+
adb shell settings put global window_animation_scale 0
163+
adb shell settings put global transition_animation_scale 0
164+
adb shell settings put global animator_duration_scale 0
165+
./gradlew connectedDebugAndroidTest -x assembleDebug -x assembleDebugAndroidTest
143166
- name: Upload test results
144167
uses: actions/upload-artifact@v7
145168
if: always()
@@ -151,4 +174,3 @@ jobs:
151174
if: always()
152175
with:
153176
report_paths: 'app/build/outputs/androidTest-results/connected/**/*.xml'
154-

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ apply {
3232
dependencies {
3333
// Compile Build Dependencies
3434
implementation fileTree(include: ["*.jar"], dir: "libs")
35-
implementation 'com.google.android.material:material:1.13.0'
35+
implementation 'com.google.android.material:material:1.14.0'
3636
implementation 'androidx.annotation:annotation:1.10.0'
3737
implementation 'androidx.appcompat:appcompat:1.7.1'
3838
implementation 'androidx.collection:collection-ktx:1.6.0'
@@ -53,7 +53,7 @@ dependencies {
5353
testImplementation 'org.robolectric:robolectric:4.16.1'
5454
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
5555
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
56-
testImplementation 'org.slf4j:slf4j-simple:2.0.17'
56+
testImplementation 'org.slf4j:slf4j-simple:2.0.18'
5757
testImplementation 'org.assertj:assertj-core:3.27.7'
5858
testImplementation 'org.hamcrest:hamcrest:3.0'
5959
// Android Test Dependencies

app/build.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Build Properties
2-
#Thu May 07 14:18:54 EDT 2026
3-
version_build=7
2+
#Sat May 30 10:26:06 EDT 2026
3+
version_build=8
44
version_major=3
55
version_minor=2
66
version_patch=2

0 commit comments

Comments
 (0)