Skip to content

Commit 7cf5df0

Browse files
CommanderRedYTCommanderRedYT
committed
Upgrade react-native to 0.86.0
1 parent aa22e50 commit 7cf5df0

10 files changed

Lines changed: 142 additions & 144 deletions

File tree

‎Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ gem 'bigdecimal'
1414
gem 'logger'
1515
gem 'benchmark'
1616
gem 'mutex_m'
17+
gem 'nkf'

‎android/app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ react {
2222

2323
/* Variants */
2424
// The list of variants to that are debuggable. For those we're going to
25-
// skip the bundling of the JS bundle and the assets. By default is just 'debug'.
25+
// skip the bundling of the JS bundle and the assets. Default is "debug", "debugOptimized".
2626
// If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
27-
// debuggableVariants = ["liteDebug", "prodDebug"]
27+
// debuggableVariants = ["liteDebug", "liteDebugOptimized", "prodDebug", "prodDebugOptimized"]
2828

2929
/* Bundling */
3030
// A list containing the node command and its flags. Default is just 'node'.

‎android/app/src/main/java/xyz/commanderred/opendtuapp/MainApplication.kt‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -8,34 +8,23 @@ import com.facebook.react.PackageList
88
import com.facebook.react.ReactApplication
99
import com.facebook.react.ReactHost
1010
import com.facebook.react.ReactNativeApplicationEntryPoint.loadReactNative
11-
import com.facebook.react.ReactNativeHost
12-
import com.facebook.react.ReactPackage
1311
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
1412
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
15-
import com.facebook.react.defaults.DefaultReactNativeHost
1613
import com.facebook.react.soloader.OpenSourceMergedSoMapping
1714
import com.facebook.soloader.SoLoader
1815

1916
class MainApplication : Application(), ReactApplication {
2017

21-
override val reactNativeHost: ReactNativeHost =
22-
ReactNativeHostWrapper(this, object : DefaultReactNativeHost(this) {
23-
override fun getPackages(): List<ReactPackage> =
24-
PackageList(this).packages.apply {
25-
// Packages that cannot be autolinked yet can be added manually here, for example:
26-
// add(MyReactNativePackage())
27-
}
28-
29-
override fun getJSMainModuleName(): String = "index"
30-
31-
override fun getUseDeveloperSupport(): Boolean = BuildConfig.DEBUG
32-
33-
override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
34-
override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
35-
})
36-
37-
override val reactHost: ReactHost
38-
get() = ReactNativeHostWrapper.createReactHost(applicationContext, reactNativeHost)
18+
override val reactHost: ReactHost by lazy {
19+
getDefaultReactHost(
20+
context = applicationContext,
21+
packageList =
22+
PackageList(this).packages.apply {
23+
// Packages that cannot be autolinked yet can be added manually here, for example:
24+
// add(MyReactNativePackage())
25+
},
26+
)
27+
}
3928

4029
override fun onCreate() {
4130
super.onCreate()

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

‎android/gradlew‎

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/gradlew.bat‎

Lines changed: 99 additions & 99 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ios/Podfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ target 'opendtureactnative' do
3333
)
3434

3535
post_install do |installer|
36-
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
3736
react_native_post_install(
3837
installer,
3938
config[:reactNativePath],

‎ios/opendtureactnative.xcodeproj/project.pbxproj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
);
290290
runOnlyForDeploymentPostprocessing = 0;
291291
shellPath = /bin/sh;
292-
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
292+
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"$REACT_NATIVE_PATH/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"$REACT_NATIVE_PATH/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"\\\"$WITH_ENVIRONMENT\\\" \\\"$REACT_NATIVE_XCODE\\\"\"\n";
293293
};
294294
00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
295295
isa = PBXShellScriptBuildPhase;
@@ -491,8 +491,10 @@
491491
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
492492
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
493493
PRODUCT_NAME = opendtureactnative;
494+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
494495
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
495496
SWIFT_VERSION = 5.0;
497+
TARGETED_DEVICE_FAMILY = "1,2";
496498
VERSIONING_SYSTEM = "apple-generic";
497499
};
498500
name = Debug;
@@ -602,7 +604,9 @@
602604
OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
603605
PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
604606
PRODUCT_NAME = opendtureactnative;
607+
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
605608
SWIFT_VERSION = 5.0;
609+
TARGETED_DEVICE_FAMILY = "1,2";
606610
VERSIONING_SYSTEM = "apple-generic";
607611
};
608612
name = Release;

‎ios/opendtureactnative/Info.plist‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleDisplayName</key>
@@ -52,6 +54,13 @@
5254
<string>UIInterfaceOrientationLandscapeLeft</string>
5355
<string>UIInterfaceOrientationLandscapeRight</string>
5456
</array>
57+
<key>UISupportedInterfaceOrientations~ipad</key>
58+
<array>
59+
<string>UIInterfaceOrientationLandscapeLeft</string>
60+
<string>UIInterfaceOrientationLandscapeRight</string>
61+
<string>UIInterfaceOrientationPortrait</string>
62+
<string>UIInterfaceOrientationPortraitUpsideDown</string>
63+
</array>
5564
<key>UIViewControllerBasedStatusBarAppearance</key>
5665
<false/>
5766
</dict>

0 commit comments

Comments
 (0)