Skip to content

Commit 2378d75

Browse files
committed
test: update tests module to react-native 0.64
1 parent 5eb2f59 commit 2378d75

File tree

17 files changed

+926
-1317
lines changed

17 files changed

+926
-1317
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
*.pbxproj -text
44
docs/typedoc.json merge=theirs linguist-vendored
55
docs/typedoc.min.json merge=theirs linguist-vendored
6+
7+
# Windows files should use crlf line endings
8+
# https://help.github.com/articles/dealing-with-line-endings/
69
*.bat text eol=crlf

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@
4343
"@babel/core": "^7.13.10",
4444
"@babel/preset-env": "7.13.10",
4545
"@babel/preset-flow": "7.12.13",
46-
"@octokit/core": "^3.3.0",
46+
"@octokit/core": "^3.3.1",
4747
"@types/jest": "^26.0.19",
48-
"@types/react": "^16.14.5",
49-
"@types/react-native": "^0.63.51",
50-
"@typescript-eslint/eslint-plugin": "^4.17.0",
51-
"@typescript-eslint/parser": "^4.17.0",
48+
"@types/react": "^17.0.3",
49+
"@types/react-native": "^0.63.52",
50+
"@typescript-eslint/eslint-plugin": "^4.18.0",
51+
"@typescript-eslint/parser": "^4.18.0",
5252
"babel-jest": "^26.6.3",
5353
"codecov": "^3.6.5",
5454
"conventional-changelog-cli": "^2.0.34",
5555
"cross-env": "^7.0.3",
56-
"eslint": "^7.21.0",
56+
"eslint": "^7.22.0",
5757
"eslint-config-prettier": "^8.1.0",
5858
"eslint-plugin-mocha": "^8.1.0",
5959
"eslint-plugin-prettier": "^3.3.0",
@@ -69,7 +69,7 @@
6969
"typescript": "^4.2.3"
7070
},
7171
"resolutions": {
72-
"@types/react": "^16.14.5"
72+
"@types/react": "^17.0.3"
7373
},
7474
"workspaces": {
7575
"packages": [

tests/.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,7 @@ end_of_line = lf
88
charset = utf-8
99
trim_trailing_whitespace = true
1010
insert_final_newline = true
11+
12+
# Windows files
13+
[*.bat]
14+
end_of_line = crlf

tests/android/app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,16 @@ def enableSeparateBuildPerCPUArchitecture = false
3737
def useIntlJsc = false
3838

3939
android {
40-
compileSdkVersion 30
40+
ndkVersion rootProject.ext.ndkVersion
41+
compileSdkVersion rootProject.ext.compileSdkVersion
4142
aaptOptions {
4243
// https://firebase.google.com/docs/ml/android/use-custom-models#local_model
4344
noCompress "tflite"
4445
}
4546
defaultConfig {
4647
applicationId "com.invertase.testing"
47-
minSdkVersion 21
48-
targetSdkVersion 30
48+
minSdkVersion rootProject.ext.minSdkVersion
49+
targetSdkVersion rootProject.ext.targetSdkVersion
4950
versionCode 1
5051
versionName "1.0"
5152

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
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+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
6+
7+
<application
8+
android:usesCleartextTraffic="true"
9+
tools:targetApi="28"
10+
tools:ignore="GoogleAppIndexingWarning">
11+
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
12+
</application>
13+
</manifest>

tests/android/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
<application
99
android:name=".MainApplication"
10-
android:hardwareAccelerated="false"
1110
android:allowBackup="false"
1211
android:icon="@drawable/ic_launcher"
1312
android:label="@string/app_name"
1413
android:launchMode="singleTask"
1514
android:theme="@style/AppTheme"
16-
android:usesCleartextTraffic="true"
1715
tools:targetApi="m">
1816
<meta-data android:name="rnfirebase_meta_testing_string" android:value="abc" />
1917
<meta-data android:name="rnfirebase_meta_testing_boolean_false" android:value="false" />
@@ -40,6 +38,5 @@
4038
android:scheme="https" />
4139
</intent-filter>
4240
</activity>
43-
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
4441
</application>
4542
</manifest>

tests/android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<resources>
22

33
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
4+
<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
55
<!-- Customize your theme here. -->
66
</style>
77

tests/android/build.gradle

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
buildscript {
2+
ext.buildToolsVersion = "30.0.2"
3+
ext.minSdkVersion = 21
4+
ext.compileSdkVersion = 30
5+
ext.targetSdkVersion = 30
6+
ext.ndkVersion = "20.1.5948944"
7+
28
ext.kotlinVersion = '1.4.31'
39
ext.supportLibVersion = "1.3.2" // this maps to androidx.core https://developer.android.com/jetpack/androidx/releases/core
410
ext.appCompatVersion = "1.2.0" // this maps to androidx.appcompat https://developer.android.com/jetpack/androidx/releases/appcompat
@@ -57,10 +63,10 @@ allprojects {
5763
subprojects {
5864
task listAllDependencies(type: DependencyReportTask) {}
5965
ext {
60-
compileSdk = 30
61-
buildTools = "30.0.2"
62-
minSdk = 21
63-
targetSdk = 30
66+
compileSdk = rootProject.ext.compileSdkVersion
67+
buildTools = rootProject.ext.buildToolsVersion
68+
minSdk = rootProject.ext.minSdkVersion
69+
targetSdk = rootProject.ext.targetSdkVersion
6470
}
6571

6672
afterEvaluate { project ->

tests/android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@ org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
1919
android.useAndroidX=true
2020
android.enableJetifier=true
2121
firebasePerformanceInstrumentationEnabled=false
22+
23+
# Version of flipper SDK to use with React Native
24+
FLIPPER_VERSION=0.75.1

tests/ios/LaunchScreen.storyboard

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,14 @@
1616
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
1717
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1818
<subviews>
19-
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2020 Invertase. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
20-
<rect key="frame" x="0.0" y="855.5" width="414" height="20.5"/>
21-
<fontDescription key="fontDescription" type="system" pointSize="17"/>
22-
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
23-
<nil key="highlightedColor"/>
24-
</label>
2519
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="React Native Firebase end-to-end test app" textAlignment="center" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
2620
<rect key="frame" x="20" y="268" width="374" height="156"/>
2721
<fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
28-
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2922
<nil key="highlightedColor"/>
3023
</label>
3124
</subviews>
3225
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
33-
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
26+
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
3427
<constraints>
3528
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
3629
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>

0 commit comments

Comments
 (0)