Skip to content

Commit b6ed9c5

Browse files
prayanshBrandon Sneed
andauthored
Fix android test-app CI failure (#271)
* fix(android): fix appComponentFactory conflict in test app * fix(android): ci failure re tools * fix(android): more ci changes * fix(android): update support lib Co-authored-by: Brandon Sneed <[email protected]>
1 parent caa9d90 commit b6ed9c5

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

packages/test-app/seed/android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ android {
143143

144144
dependencies {
145145
implementation fileTree(dir: "libs", include: ["*.jar"])
146-
implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
146+
implementation 'androidx.appcompat:appcompat:${rootProject.ext.supportLibVersion}'
147147
implementation "com.facebook.react:react-native:+" // From node_modules
148148
}
149149

packages/test-app/seed/android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1+
<manifest
2+
xmlns:android="http://schemas.android.com/apk/res/android"
23
package="com.testapp">
34

45
<uses-permission android:name="android.permission.INTERNET" />

packages/test-app/seed/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
minSdkVersion = 16
77
compileSdkVersion = 28
88
targetSdkVersion = 28
9-
supportLibVersion = "28.0.0"
9+
supportLibVersion = "1.0.2"
1010
kotlinVersion = "1.3.0"
1111
detoxKotlinVersion = kotlinVersion
1212
}

packages/test-app/seed/android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19+
20+
android.useAndroidX=true
21+
android.enableJetifier=true

0 commit comments

Comments
 (0)