Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[No QA] Upgrade React Native to 0.66 #6914

Merged
merged 11 commits into from
Jan 6, 2022
Merged

[No QA] Upgrade React Native to 0.66 #6914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ee59735
Upgrade react-native, clean project, add clean script
roryabraham Dec 28, 2021
e2651b7
Update react-native-reanimated
roryabraham Dec 28, 2021
9ffd04f
Remove deprecated Dimensions.removeEventListener usages
roryabraham Dec 28, 2021
bdb89ae
Update android build settings
roryabraham Dec 28, 2021
440e074
Update metro-react-native-babel-preset
roryabraham Dec 28, 2021
c5e59ef
Apply XCode 12.5 M1 post install workaround
roryabraham Dec 28, 2021
f235f90
Upgrade react-native-config and plaid to get android to build
roryabraham Dec 30, 2021
31c73d8
Update pods again
roryabraham Dec 30, 2021
c175646
Merge branch 'main' into Rory-UpgradeRN
roryabraham Jan 4, 2022
41025e1
Reinstall pods after resolving merge conflicts
roryabraham Jan 4, 2022
6c8ef70
Update comment
roryabraham Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,14 @@ def jscFlavor = 'org.webkit:android-jsc:+'
*/
def enableHermes = project.ext.react.get("enableHermes", false);

/**
* Required in order to build native code for debug builds
*/
def nativeArchitectures = project.getProperties().get("reactNativeDebugArchitectures")

android {
compileSdkVersion rootProject.ext.compileSdkVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

Julesssss marked this conversation as resolved.
Show resolved Hide resolved
packagingOptions {
pickFirst 'lib/x86/libc++_shared.so'
pickFirst 'lib/x86_64/libjsc.so'
Expand Down Expand Up @@ -179,6 +179,11 @@ android {
buildTypes {
debug {
signingConfig signingConfigs.debug
if (nativeArchitectures) {
ndk {
abiFilters nativeArchitectures.split(',')
}
}
}
release {
signingConfig signingConfigs.release
Expand Down Expand Up @@ -256,7 +261,7 @@ dependencies {
// Run this once to be able to run the application with BUCK
// puts all compile dependencies into folder libs for BUCK to use
task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
from configurations.implementation
into 'libs'
}

Expand Down
2 changes: 0 additions & 2 deletions android/app/src/main/java/com/expensify/chat/MainApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.soloader.SoLoader;
import com.plaid.PlaidPackage;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Field;
import java.util.List;
Expand All @@ -34,7 +33,6 @@ protected List<ReactPackage> getPackages() {
List<ReactPackage> packages = new PackageList(this).getPackages();
// Packages that cannot be autolinked yet can be added manually here, for example:
// packages.add(new MyReactNativePackage());
packages.add(new PlaidPackage());
packages.add(new ExpensifyAppPackage());

return packages;
Expand Down
8 changes: 4 additions & 4 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

buildscript {
ext {
buildToolsVersion = "29.0.2"
buildToolsVersion = "30.0.2"
minSdkVersion = 21
compileSdkVersion = 30
targetSdkVersion = 30
Expand All @@ -13,10 +13,10 @@ buildscript {
}
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:4.1.0")
classpath("com.android.tools.build:gradle:4.2.2")
classpath("com.google.gms:google-services:4.3.4")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.7.1")
classpath("com.google.firebase:perf-plugin:1.4.0")
Expand All @@ -28,6 +28,7 @@ buildscript {

allprojects {
repositories {
mavenCentral()
mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
Expand All @@ -39,7 +40,6 @@ allprojects {
}

google()
jcenter()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jcenter is donezo: react-native-community/discussions-and-proposals#331

Copy link
Contributor

@Julesssss Julesssss Jan 5, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made this change in Mobile-Expensify and was going to make it here too, but JCenter changed their mind and will support old packages forever. So this isn't really necessary anymore

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/

UPDATE 4/27/2021: We listened to the community and will keep JCenter as a read-only repository indefinitely. Our customers and the community can continue to rely on JCenter as a reliable mirror for Java packages.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Regardless, we should stick with the upgrade guide and use mavencentral instead, don't you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the update guide is wrong here, but I guess it's NAB 🤷‍♂️

maven { url 'https://www.jitpack.io' }
}
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
244 changes: 124 additions & 120 deletions ios/NewExpensify.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion ios/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ platform :ios, '11.0'
target 'NewExpensify' do
permissions_path = '../node_modules/react-native-permissions/ios'

pod 'Plaid', '~> 2.2.0'
pod 'Plaid', '~> 2.3.1'
pod 'Permission-LocationAccuracy', :path => "#{permissions_path}/LocationAccuracy"
pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways"
pod 'Permission-LocationWhenInUse', :path => "#{permissions_path}/LocationWhenInUse"
Expand All @@ -30,6 +30,7 @@ target 'NewExpensify' do

post_install do |installer|
react_native_post_install(installer)
__apply_Xcode_12_5_M1_post_install_workaround(installer)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

facebook/react-native@ac4ddec


installer.pods_project.build_configurations.each do |config|
config.build_settings["EXCLUDED_ARCHS[sdk=iphonesimulator*]"] = "arm64"
Expand Down
Loading