Skip to content

Commit 89fb79a

Browse files
committed
build(deps): bump test app to react-native 0.65.1
- includes all the changes from upgrade-helper - remove Podfile post_install minimum iOS version convergence this seems to be an anti-pattern now, Folly+iOS at least fails to compile with this stanza included
1 parent 262452d commit 89fb79a

File tree

9 files changed

+475
-530
lines changed

9 files changed

+475
-530
lines changed

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@
9696
"**/detox",
9797
"**/detox/**",
9898
"**/prop-types/**",
99+
"react-native-codegen",
100+
"**/react-native-codegen",
101+
"**/react-native-codegen/**",
99102
"**/react-native-port-patcher/**",
100103
"**/@react-native-firebase/private-tests-helpers",
101104
"**/@react-native-firebase/private-tests-helpers/**",

tests/android/app/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,6 @@ android {
9797
}
9898
}
9999

100-
compileOptions {
101-
sourceCompatibility 1.8
102-
targetCompatibility 1.8
103-
}
104-
105100
// applicationVariants are e.g. debug, release
106101
applicationVariants.all { variant ->
107102
variant.outputs.each { output ->

tests/android/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ allprojects {
4343
println "${project.name} ${projectDir} ${rootDir}"
4444

4545
repositories {
46-
google()
4746
mavenLocal()
4847
maven {
4948
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -57,8 +56,8 @@ allprojects {
5756
// // Detox as an .aar file (we're going to use it as a compile dependency though, to patch it)
5857
// url "$rootDir/../node_modules/detox/Detox-android"
5958
// }
59+
google()
6060
mavenCentral()
61-
jcenter() // com.facebook.yoa:proguard-annotations not published elsewhere yet, and react-native needs new flipper+fbjni-java-only
6261
}
6362
}
6463

tests/android/gradle.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ org.gradle.jvmargs=-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
1919
android.useAndroidX=true
20-
android.enableJetifier=true
20+
# We may finally disable this!
21+
#android.enableJetifier=true
2122
firebasePerformanceInstrumentationEnabled=false
2223

2324
# Version of flipper SDK to use with React Native
24-
FLIPPER_VERSION=0.75.1
25+
FLIPPER_VERSION=0.93.0

tests/ios/Podfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ target 'testing' do
4646
post_install do |installer|
4747
react_native_post_install(installer)
4848

49-
# We support a smaller range of deployment than some libraries, eliminate related noise
50-
installer.pods_project.targets.each do |target|
51-
target.build_configurations.each do |config|
52-
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = $iOSMinimumDeployVersion
53-
end
54-
end
55-
5649
# This is needed for Apple Silicon (M1) builds https://github.com/facebook/react-native/issues/31941
5750
installer.aggregate_targets.each do |aggregate_target|
5851
aggregate_target.user_project.native_targets.each do |target|

0 commit comments

Comments
 (0)