Skip to content

Commit c05b635

Browse files
M-i-k-e-lM-i-k-e-l
committed
RN77 upgrade + new arch
Android runs (still need to fix native) | iOS red screen | docuilib still has errors
1 parent 64b45b3 commit c05b635

File tree

18 files changed

+736
-649
lines changed

18 files changed

+736
-649
lines changed

‎android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66
minSdkVersion = 26
77
compileSdkVersion = 35
88
targetSdkVersion = 34
9-
ndkVersion = "26.1.10909125"
10-
RNNKotlinVersion = "1.9.25"
9+
ndkVersion = "27.1.12297006"
10+
kotlinVersion = "2.0.21"
1111
}
1212
repositories {
1313
mavenLocal()
@@ -19,7 +19,7 @@ buildscript {
1919
classpath("com.facebook.react:react-native-gradle-plugin")
2020
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
2121

22-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$RNNKotlinVersion"
22+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
2323
}
2424
}
2525

‎android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
2828
# your application. You should enable this flag either if you want
2929
# to write custom TurboModules/Fabric components OR use libraries that
3030
# are providing them.
31-
newArchEnabled=false
31+
newArchEnabled=true
3232

3333
# Use this property to enable or disable the Hermes JS engine.
3434
# If set to false, you will be using JSC instead.

‎docuilib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"@types/react": "^17.0.14",
4444
"@types/react-helmet": "^6.1.2",
4545
"@types/react-router-dom": "^5.1.8",
46-
"metro-react-native-babel-preset": "0.76.9",
46+
"metro-react-native-babel-preset": "0.77.0",
4747
"react": "^18.2.0",
4848
"react-dom": "^18.2.0",
4949
"react-native-linear-gradient": "2.6.2",

‎docuilib/plugins/uilib.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ module.exports = ({siteDir}, _options) => {
66
path.resolve(siteDir, 'src'),
77
path.resolve(siteDir, 'node_modules/react-native-web'),
88
path.resolve(siteDir, 'node_modules/react-native-ui-lib'),
9-
// // just for not getting warnings
109
path.resolve(siteDir, 'node_modules/react-native-shimmer-placeholder'),
10+
path.resolve(siteDir, 'node_modules/react-native-reanimated'),
1111
path.resolve(siteDir, 'node_modules/react-native-linear-gradient')
12-
// // end just for not getting warnings
12+
// just for not getting warnings
1313
// path.resolve(siteDir, 'node_modules/react-native-haptic-feedback'),
1414
// path.resolve(siteDir, 'node_modules/react-native-animatable'),
15-
// path.resolve(siteDir, 'node_modules/react-native-reanimated'),
1615
// path.resolve(siteDir, 'node_modules/react-native-svg'),
1716
// path.resolve(siteDir, 'node_modules/react-native-svg-transformer'),
1817
// path.resolve(siteDir, 'node_modules/@react-native-community/netinfo'),

‎docuilib/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9173,9 +9173,9 @@ __metadata:
91739173
languageName: node
91749174
linkType: hard
91759175

9176-
"metro-react-native-babel-preset@npm:0.76.9":
9177-
version: 0.76.9
9178-
resolution: "metro-react-native-babel-preset@npm:0.76.9"
9176+
"metro-react-native-babel-preset@npm:0.77.0":
9177+
version: 0.77.0
9178+
resolution: "metro-react-native-babel-preset@npm:0.77.0"
91799179
dependencies:
91809180
"@babel/core": ^7.20.0
91819181
"@babel/plugin-proposal-async-generator-functions": ^7.0.0
@@ -9218,7 +9218,7 @@ __metadata:
92189218
react-refresh: ^0.4.0
92199219
peerDependencies:
92209220
"@babel/core": "*"
9221-
checksum: 344fbcbcf82a9f8425a38a910716777cf45619d7b61a1a935a903f751e3a335ff8a54f80ba9fd9a16b96ac74e68f77760cb09d2c40ec6faf113308c91b863a9e
9221+
checksum: 09fb64735d4517f62cb0cbd386bdfa64d0de5a4f8c85b54c36b5799b242e897295d58c9d18e124033233841d8fcd33a109dda3dd9f1e5554e516f689eef14a0d
92229222
languageName: node
92239223
linkType: hard
92249224

@@ -13524,7 +13524,7 @@ __metadata:
1352413524
clsx: ^1.1.1
1352513525
docusaurus-plugin-sass: ^0.2.1
1352613526
file-loader: ^6.2.0
13527-
metro-react-native-babel-preset: 0.76.9
13527+
metro-react-native-babel-preset: 0.77.0
1352813528
prettier: 2.8.8
1352913529
prism-react-renderer: ^2.4.1
1353013530
react: ^18.2.0

‎expoDemo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"metro-config": "^0.75.1",
1919
"react": "18.2.0",
2020
"react-dom": "18.2.0",
21-
"react-native": "0.76.9",
21+
"react-native": "0.77.2",
2222
"react-native-gesture-handler": "2.25.0",
2323
"react-native-haptic-feedback": "^1.14.0",
2424
"react-native-navigation": "8.0.0",

‎ios/Podfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ENV['RCT_NEW_ARCH_ENABLED'] = '0'
21
# Resolve react_native_pods.rb with node to allow for hoisting
32
require Pod::Executable.execute_command('node', ['-p',
43
'require.resolve(
@@ -24,12 +23,6 @@ target 'rnuilib' do
2423
# An absolute path to your application root.
2524
:app_path => "#{Pod::Config.instance.installation_root}/.."
2625
)
27-
28-
target 'rnuilibTests' do
29-
inherit! :complete
30-
# Pods for testing
31-
# use_flipper!()
32-
end
3326

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

‎ios/rnuilib.xcodeproj/project.pbxproj

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,9 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
00E356F31AD99517003FC87E /* rnuilibTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* rnuilibTests.m */; };
11-
10A864C1285B5CB00011FF03 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 10A864C0285B5CB00011FF03 /* AppDelegate.mm */; };
10+
1049B78E2DCB6CE500688FC9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1049B78D2DCB6CE500688FC9 /* AppDelegate.swift */; };
1211
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13-
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
1412
2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
15-
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
16-
2DCD954D1E0B4F2C00145EB5 /* rnuilibTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* rnuilibTests.m */; };
1713
56EBC4A1F72808C5B51F7BBF /* libPods-rnuilib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6C5768CF5EB4CEC5AF24695D /* libPods-rnuilib.a */; };
1814
8E52CBDF2887DD21009D5EC5 /* DesignTokens.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8E52CBDE2887DD21009D5EC5 /* DesignTokens.xcassets */; };
1915
8E8B0D662744D9CD0026B520 /* void.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8E8B0D652744D9CD0026B520 /* void.swift */; };
@@ -43,17 +39,13 @@
4339
/* Begin PBXFileReference section */
4440
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
4541
00E356EE1AD99517003FC87E /* rnuilibTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = rnuilibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
46-
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
47-
00E356F21AD99517003FC87E /* rnuilibTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = rnuilibTests.m; sourceTree = "<group>"; };
48-
10A864C0285B5CB00011FF03 /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = rnuilib/AppDelegate.mm; sourceTree = "<group>"; };
42+
1049B78D2DCB6CE500688FC9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppDelegate.swift; path = rnuilib/AppDelegate.swift; sourceTree = "<group>"; };
4943
13B07F961A680F5B00A75B9A /* rnuilib.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rnuilib.app; sourceTree = BUILT_PRODUCTS_DIR; };
50-
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = rnuilib/AppDelegate.h; sourceTree = "<group>"; };
5144
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = rnuilib/Images.xcassets; sourceTree = "<group>"; };
5245
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = rnuilib/Info.plist; sourceTree = "<group>"; };
53-
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = rnuilib/main.m; sourceTree = "<group>"; };
5446
2D02E47B1E0B4A5D006451C7 /* rnuilib-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "rnuilib-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
5547
2D02E4901E0B4A5D006451C7 /* rnuilib-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "rnuilib-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
56-
411699F1CD4A37F8779A4620 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = rnuilib/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
48+
411699F1CD4A37F8779A4620 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = rnuilib/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
5749
56523CB09C6A79FEBA0C210A /* Pods-rnuilib-rnuilibTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnuilib-rnuilibTests.release.xcconfig"; path = "Target Support Files/Pods-rnuilib-rnuilibTests/Pods-rnuilib-rnuilibTests.release.xcconfig"; sourceTree = "<group>"; };
5850
65B766BC0A8D1F830F3D2004 /* Pods-rnuilib.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnuilib.debug.xcconfig"; path = "Target Support Files/Pods-rnuilib/Pods-rnuilib.debug.xcconfig"; sourceTree = "<group>"; };
5951
66AD894C4A02A884861A27E2 /* Pods-rnuilib.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-rnuilib.release.xcconfig"; path = "Target Support Files/Pods-rnuilib/Pods-rnuilib.release.xcconfig"; sourceTree = "<group>"; };
@@ -62,7 +54,7 @@
6254
8E52CBDE2887DD21009D5EC5 /* DesignTokens.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = DesignTokens.xcassets; sourceTree = "<group>"; };
6355
8E8B0D652744D9CD0026B520 /* void.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = void.swift; sourceTree = "<group>"; };
6456
8EA1FC8B2519E7F7008B4B36 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = rnuilib/LaunchScreen.storyboard; sourceTree = "<group>"; };
65-
DED5A85D4BF49DFA47437893 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = rnuilib/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
57+
DED5A85D4BF49DFA47437893 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = rnuilib/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
6658
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
6759
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
6860
FB858F3A7230EAA142D23DA1 /* libPods-rnuilib-rnuilibTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-rnuilib-rnuilibTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -102,33 +94,14 @@
10294
/* End PBXFrameworksBuildPhase section */
10395

10496
/* Begin PBXGroup section */
105-
00E356EF1AD99517003FC87E /* rnuilibTests */ = {
106-
isa = PBXGroup;
107-
children = (
108-
00E356F21AD99517003FC87E /* rnuilibTests.m */,
109-
00E356F01AD99517003FC87E /* Supporting Files */,
110-
);
111-
path = rnuilibTests;
112-
sourceTree = "<group>";
113-
};
114-
00E356F01AD99517003FC87E /* Supporting Files */ = {
115-
isa = PBXGroup;
116-
children = (
117-
00E356F11AD99517003FC87E /* Info.plist */,
118-
);
119-
name = "Supporting Files";
120-
sourceTree = "<group>";
121-
};
12297
13B07FAE1A68108700A75B9A /* rnuilib */ = {
12398
isa = PBXGroup;
12499
children = (
125100
8E52CBDE2887DD21009D5EC5 /* DesignTokens.xcassets */,
126-
10A864C0285B5CB00011FF03 /* AppDelegate.mm */,
101+
1049B78D2DCB6CE500688FC9 /* AppDelegate.swift */,
127102
008F07F21AC5B25A0029DE68 /* main.jsbundle */,
128-
13B07FAF1A68108700A75B9A /* AppDelegate.h */,
129103
13B07FB51A68108700A75B9A /* Images.xcassets */,
130104
13B07FB61A68108700A75B9A /* Info.plist */,
131-
13B07FB71A68108700A75B9A /* main.m */,
132105
8EA1FC8B2519E7F7008B4B36 /* LaunchScreen.storyboard */,
133106
8E8B0D652744D9CD0026B520 /* void.swift */,
134107
DED5A85D4BF49DFA47437893 /* PrivacyInfo.xcprivacy */,
@@ -159,7 +132,6 @@
159132
children = (
160133
13B07FAE1A68108700A75B9A /* rnuilib */,
161134
832341AE1AAA6A7D00B99B32 /* Libraries */,
162-
00E356EF1AD99517003FC87E /* rnuilibTests */,
163135
83CBBA001A601CBA00E9B192 /* Products */,
164136
2D16E6871FA4F8E400B85C8A /* Frameworks */,
165137
D99C980AB24A05601E0007F9 /* Pods */,
@@ -571,16 +543,14 @@
571543
isa = PBXSourcesBuildPhase;
572544
buildActionMask = 2147483647;
573545
files = (
574-
00E356F31AD99517003FC87E /* rnuilibTests.m in Sources */,
575546
);
576547
runOnlyForDeploymentPostprocessing = 0;
577548
};
578549
13B07F871A680F5B00A75B9A /* Sources */ = {
579550
isa = PBXSourcesBuildPhase;
580551
buildActionMask = 2147483647;
581552
files = (
582-
13B07FC11A68108700A75B9A /* main.m in Sources */,
583-
10A864C1285B5CB00011FF03 /* AppDelegate.mm in Sources */,
553+
1049B78E2DCB6CE500688FC9 /* AppDelegate.swift in Sources */,
584554
8E8B0D662744D9CD0026B520 /* void.swift in Sources */,
585555
);
586556
runOnlyForDeploymentPostprocessing = 0;
@@ -589,15 +559,13 @@
589559
isa = PBXSourcesBuildPhase;
590560
buildActionMask = 2147483647;
591561
files = (
592-
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */,
593562
);
594563
runOnlyForDeploymentPostprocessing = 0;
595564
};
596565
2D02E48C1E0B4A5D006451C7 /* Sources */ = {
597566
isa = PBXSourcesBuildPhase;
598567
buildActionMask = 2147483647;
599568
files = (
600-
2DCD954D1E0B4F2C00145EB5 /* rnuilibTests.m in Sources */,
601569
);
602570
runOnlyForDeploymentPostprocessing = 0;
603571
};

‎ios/rnuilib/AppDelegate.h

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎ios/rnuilib/AppDelegate.mm

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎ios/rnuilib/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 = "rnuilib"
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+
}

‎ios/rnuilib/main.m

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ios/rnuilibTests/Info.plist

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)