Skip to content

Commit d1af289

Browse files
kligarskijakex7kkafar
authored
feat: add support for [email protected] (#2739)
## Description Adding support for `[email protected]`. **RN version of the library still left at `0.72.4`.** ## Changes - adjusted example apps on both architectures with changes from upgrade helper, - added codegen `ios.componentProvider` - #2567 - #2583 - removed providers that are not present in this version (RNSScreenFooter, RNSScreenContentWrapper) (ef2c7a4) - bumped dependencies: - `react-native-gesture-handler` to `2.22.0` - `react-native-reanimated` to `3.16.7` - `react-native-safe-area-context` to `5.1.0` - removed patches that were no longer needed - updated view manager interfaces (f968e05) - in order for this to work, **commented out codegen script** from Example/android/app/build.gradle (bf30abf), as it was overwriting correct fix -> **needs to be investigated** - fixed build issues on iOS (0f53ad1) - #2497 - adjusted to 3.x (removed unnecessary files, imports) - changed Metro config for FabricExample (ef2c7a4) ## Test code and steps to reproduce CI ## Checklist - [ ] Ensured that CI passes --------- Co-authored-by: Jakub Grzywacz <[email protected]> Co-authored-by: Kacper Kafara <[email protected]>
1 parent 8c4ac22 commit d1af289

File tree

57 files changed

+2872
-2756
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2872
-2756
lines changed

Example/Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ ruby ">= 2.6.10"
66
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
77
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
88
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
9+
gem 'xcodeproj', '< 1.26.0'
10+
gem 'concurrent-ruby', '< 1.3.4'

Example/Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ PLATFORMS
106106
DEPENDENCIES
107107
activesupport (>= 6.1.7.5, != 7.1.0)
108108
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
109+
concurrent-ruby (< 1.3.4)
110+
xcodeproj (< 1.26.0)
109111

110112
RUBY VERSION
111113
ruby 3.2.1p31

Example/android/app/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ dependencies {
139139

140140
apply plugin: 'com.github.node-gradle.node'
141141

142-
task syncArchs(type: NodeTask) {
143-
group = 'Build'
144-
description = 'Run sync beetwen Paper and Fabric arch'
145-
yarn_install
146-
script = file('../../../scripts/codegen-sync-archs.js')
147-
}
148-
149-
tasks['preBuild'].dependsOn(syncArchs)
142+
//task syncArchs(type: NodeTask) {
143+
// group = 'Build'
144+
// description = 'Run sync beetwen Paper and Fabric arch'
145+
// yarn_install
146+
// script = file('../../../scripts/codegen-sync-archs.js')
147+
//}
148+
//
149+
//tasks['preBuild'].dependsOn(syncArchs)

Example/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ buildscript {
44
minSdkVersion = 24
55
compileSdkVersion = 35
66
targetSdkVersion = 34
7-
ndkVersion = "26.1.10909125"
8-
kotlinVersion = "1.9.24"
7+
ndkVersion = "27.1.12297006"
8+
kotlinVersion = "2.0.21"
99
}
1010
repositories {
1111
google()

Example/ios/AppDelegate.swift

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
import UIKit
2+
import React
3+
import React_RCTAppDelegate
4+
import ReactAppDependencyProvider
5+
6+
@main
7+
class AppDelegate: RCTAppDelegate {
8+
override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
9+
self.moduleName = "ScreensExample"
10+
self.dependencyProvider = RCTAppDependencyProvider()
11+
12+
// You can add your custom initial props in the dictionary below.
13+
// They will be passed down to the ViewController used by React Native.
14+
self.initialProps = [:]
15+
16+
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
17+
}
18+
19+
override func sourceURL(for bridge: RCTBridge) -> URL? {
20+
self.bundleURL()
21+
}
22+
23+
override func bundleURL() -> URL? {
24+
#if DEBUG
25+
RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
26+
#else
27+
Bundle.main.url(forResource: "main", withExtension: "jsbundle")
28+
#endif
29+
}
30+
}

Example/ios/Podfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ target 'ScreensExample' do
2525
# An absolute path to your application root.
2626
:app_path => "#{Pod::Config.instance.installation_root}/.."
2727
)
28-
29-
target 'ScreensExampleTests' do
30-
inherit! :complete
31-
# Pods for testing
32-
end
3328

3429
post_install do |installer|
3530
# https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202

0 commit comments

Comments
 (0)