Skip to content

Commit

Permalink
chore: upgrade react native to 0.76 (#11316)
Browse files Browse the repository at this point in the history
* react native upgrade diff

* update deployment target to 15.1

* update deployment target to 15.1 in podfile

* install deps after rn upgrade

* upgrade segment plugin to fix android build issue

* fix deps after bad merge

* try upgrading react-native-svg to fix build failure

* remove now unused patch for flipper

* missed native side update for rnsvg

* remove now included dev menu native module

* upgrade heap size to fix android initial builds
  • Loading branch information
brainbicycle authored Dec 28, 2024
1 parent 9f6d733 commit fef6a1c
Show file tree
Hide file tree
Showing 14 changed files with 1,428 additions and 1,379 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ gem 'fastlane', '2.225.0'
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'

# So we know if we need to run `pod install`
gem 'cocoapods-check'
Expand Down
7 changes: 4 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ GEM
molinillo (0.8.0)
multi_json (1.15.0)
multipart-post (2.4.1)
nanaimo (0.4.0)
nanaimo (0.3.0)
nap (1.1.0)
naturally (2.2.1)
netrc (0.11.0)
Expand Down Expand Up @@ -294,12 +294,12 @@ GEM
xcode-install (2.8.1)
claide (>= 0.9.1)
fastlane (>= 2.1.0, < 3.0.0)
xcodeproj (1.27.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
nanaimo (~> 0.3.0)
rexml (>= 3.3.6, < 4.0)
xcpretty (0.3.0)
rouge (~> 2.0.7)
Expand All @@ -324,6 +324,7 @@ DEPENDENCIES
json
lowdown
xcode-install
xcodeproj (< 1.26.0)
xcpretty

RUBY VERSION
Expand Down
3 changes: 2 additions & 1 deletion android/app/src/main/java/net/artsy/app/MainApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.defaults.DefaultReactNativeHost
import com.facebook.soloader.SoLoader
import com.facebook.react.soloader.OpenSourceMergedSoMapping
import com.google.firebase.messaging.FirebaseMessaging
import com.microsoft.codepush.react.CodePush
import com.segment.analytics.Analytics
Expand Down Expand Up @@ -46,7 +47,7 @@ class MainApplication : Application(), ReactApplication {

override fun onCreate() {
super.onCreate()
SoLoader.init(this, /* native exopackage */ false)
SoLoader.init(this, OpenSourceMergedSoMapping)
if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
// If you opted-in for the New Architecture, we load the native entry point for this app.
load()
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ buildscript {
ext {
googlePlayServicesVersion = "17.0.0"
firebaseMessagingVersion = "21.1.0" // matching firebaseIidVersion to avoid duplicate class error
buildToolsVersion = "34.0.0"
buildToolsVersion = "35.0.0"
minSdkVersion = 24
compileSdkVersion = 34
compileSdkVersion = 35
targetSdkVersion = 34
firebaseIidVersion = "21.1.0" // Needed for react-native-device-info
googlePlayServicesAuthVersion = "16.0.1"
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
org.gradle.jvmargs=-Xmx3g -XX:MaxMetaspaceSize=512m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion android/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions android/gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
18 changes: 10 additions & 8 deletions ios/Artsy.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -4297,7 +4297,7 @@
GCC_WARN_STRICT_SELECTOR_MATCH = NO;
GCC_WARN_UNDECLARED_SELECTOR = NO;
INFOPLIST_FILE = "$(SRCROOT)/Artsy/App_Resources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4375,7 +4375,7 @@
GCC_WARN_STRICT_SELECTOR_MATCH = NO;
GCC_WARN_UNDECLARED_SELECTOR = NO;
INFOPLIST_FILE = "$(SRCROOT)/Artsy/App_Resources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4612,7 +4612,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ArtsyStickers/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Artsy Stickers";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
Expand Down Expand Up @@ -4650,7 +4650,7 @@
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ArtsyStickers/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "Artsy Stickers";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
Expand Down Expand Up @@ -4687,7 +4687,7 @@
INFOPLIST_FILE = BrazePushServiceExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = BrazePushServiceExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Artsy. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4733,7 +4733,7 @@
INFOPLIST_FILE = BrazePushServiceExtension/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = BrazePushServiceExtension;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2022 Artsy. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4779,6 +4779,7 @@
INFOPLIST_FILE = ArtsyWidget/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ArtsyWidget;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Artsy. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4826,6 +4827,7 @@
INFOPLIST_FILE = ArtsyWidget/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = ArtsyWidget;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2021 Artsy. All rights reserved.";
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -4883,7 +4885,7 @@
);
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "ArtsyTests/Supporting_Files/Artsy_Tests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
Expand Down Expand Up @@ -4930,7 +4932,7 @@
GCC_PREFIX_HEADER = "ArtsyTests/Supporting_Files/Artsy_Tests-Prefix.pch";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "ArtsyTests/Supporting_Files/Artsy_Tests-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
IPHONEOS_DEPLOYMENT_TARGET = 15.1;
LIBRARY_SEARCH_PATHS = (
"$(SDKROOT)/usr/lib/swift",
"$(inherited)",
Expand Down
7 changes: 4 additions & 3 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ require Pod::Executable.execute_command('node', ['-p',
)', __dir__]).strip

project 'Artsy.xcodeproj'
platform :ios, '14.0'
platform :ios, '15.1'
inhibit_all_warnings! # ignore all warnings from all pods

prepare_react_native_project!
Expand Down Expand Up @@ -68,7 +68,8 @@ target 'Artsy' do
:path => config[:reactNativePath],
:production => ENV['CIRCLE_BUILD_NUM'],
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
:app_path => "#{Pod::Config.instance.installation_root}/..",
new_arch_enabled: false
)

# Networking
Expand Down Expand Up @@ -163,7 +164,7 @@ target 'Artsy' do
config.build_settings['EXPANDED_CODE_SIGN_IDENTITY'] = ""
config.build_settings['CODE_SIGNING_REQUIRED'] = "NO"
config.build_settings['CODE_SIGNING_ALLOWED'] = "NO"
config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "14.0"
config.build_settings["IPHONEOS_DEPLOYMENT_TARGET"] = "15.1"
end
end
end
Expand Down
Loading

0 comments on commit fef6a1c

Please sign in to comment.