Skip to content

Commit fa57030

Browse files
Merge pull request #1133 from mendix/fix-manifest-file-related-issue-personal-finance
during building apk for personal finance, it throws error if test fol…
2 parents 2204e59 + 3abcdaf commit fa57030

2 files changed

Lines changed: 28 additions & 1 deletion

File tree

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<application>
6+
<!-- Fix for androidx.test.core activities requiring explicit exported for Android 12+ -->
7+
<activity
8+
android:name="androidx.test.core.app.InstrumentationActivityInvoker$BootstrapActivity"
9+
android:exported="true"
10+
tools:node="merge"
11+
tools:replace="android:exported" />
12+
13+
<activity
14+
android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyActivity"
15+
android:exported="true"
16+
tools:node="merge"
17+
tools:replace="android:exported" />
18+
19+
<activity
20+
android:name="androidx.test.core.app.InstrumentationActivityInvoker$EmptyFloatingActivity"
21+
android:exported="true"
22+
tools:node="merge"
23+
tools:replace="android:exported" />
24+
</application>
25+
26+
</manifest>

android/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ mendixnative.cookieEncryption=false
2828
VisionCamera_enableCodeScanner=true
2929

3030
# Enable edge-to-edge display
31-
edgeToEdgeEnabled=true
31+
edgeToEdgeEnabled=true
32+
android.testInstrumentationRunnerArguments.notAnnotation=androidx.test.filters.FlakyTest

0 commit comments

Comments
 (0)