Skip to content

Commit 30ebe60

Browse files
authored
Merge pull request #381 from jpudysz/feature/frameworks
feat: attempt to build with use frameworks
2 parents e9d7f68 + 8d375e6 commit 30ebe60

File tree

7 files changed

+31
-22
lines changed

7 files changed

+31
-22
lines changed

Unistyles.podspec

+7-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,13 @@ Pod::Spec.new do |s|
2626
"ios/Unistyles.h"
2727
]
2828

29-
load 'nitrogen/generated/ios/Unistyles+autolinking.rb'
29+
if ENV["USE_FRAMEWORKS"]
30+
s.dependency "React-Core"
31+
add_dependency(s, "React-jsinspector", :framework_name => "jsinspector_modern")
32+
add_dependency(s, "React-rendererconsistency", :framework_name => "React_rendererconsistency")
33+
end
34+
35+
load "nitrogen/generated/ios/Unistyles+autolinking.rb"
3036
add_nitrogen_files(s)
3137

3238
install_modules_dependencies(s)

example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"react-native": "0.76.3",
1313
"react-native-blurhash": "2.1.0",
1414
"react-native-edge-to-edge": "1.1.3",
15-
"react-native-nitro-modules": "0.18.0",
15+
"react-native-nitro-modules": "0.18.1",
1616
"react-native-reanimated": "3.16.2",
1717
"react-native-unistyles": "workspace:*"
1818
},

expo-example/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"react-dom": "18.3.1",
2121
"react-native": "0.76.2",
2222
"react-native-edge-to-edge": "1.1.2",
23-
"react-native-nitro-modules": "0.18.0",
23+
"react-native-nitro-modules": "0.18.1",
2424
"react-native-safe-area-context": "4.14.0",
2525
"react-native-screens": "4.1.0",
2626
"react-native-web": "0.19.13"

expo-example/yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -4439,7 +4439,7 @@ __metadata:
44394439
react-dom: 18.3.1
44404440
react-native: 0.76.2
44414441
react-native-edge-to-edge: 1.1.2
4442-
react-native-nitro-modules: 0.18.0
4442+
react-native-nitro-modules: 0.18.1
44434443
react-native-safe-area-context: 4.14.0
44444444
react-native-screens: 4.1.0
44454445
react-native-web: 0.19.13
@@ -7531,13 +7531,13 @@ __metadata:
75317531
languageName: node
75327532
linkType: hard
75337533

7534-
"react-native-nitro-modules@npm:0.18.0":
7535-
version: 0.18.0
7536-
resolution: "react-native-nitro-modules@npm:0.18.0"
7534+
"react-native-nitro-modules@npm:0.18.1":
7535+
version: 0.18.1
7536+
resolution: "react-native-nitro-modules@npm:0.18.1"
75377537
peerDependencies:
75387538
react: "*"
75397539
react-native: "*"
7540-
checksum: 336989864c032e7335e0ced36106615c6c3d9f0044dde117b591ae94c4a0490a4132d0b1496bea4c05879f3ff71f51938155e50eb2b2999e83750253ca25ee5d
7540+
checksum: 641dd59674e1b0658ef5e66655f71596053dfe179f437f487ad65e95ce44ef8c70c0fdbe6098cb18c1e1f4eb71ec18bb1b7a59e09adeef9ed42552d3517bbc6c
75417541
languageName: node
75427542
linkType: hard
75437543

nitrogen/generated/ios/Unistyles-Swift-Cxx-Umbrella.hpp

+3
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ namespace Unistyles { class HybridNativePlatformSpecCxx; }
5454
// This header is generated by Xcode/Swift on every app build.
5555
// If it cannot be found, make sure the Swift module's name (= podspec name) is actually "Unistyles".
5656
#include "Unistyles-Swift.h"
57+
// Same as above, but used when building with frameworks (`use_frameworks`)
58+
#elif __has_include(<Unistyles/Unistyles-Swift.h>)
59+
#include <Unistyles/Unistyles-Swift.h>
5760
#else
5861
#error Unistyles's autogenerated Swift header cannot be found! Make sure the Swift module's name (= podspec name) is actually "Unistyles", and try building the app first.
5962
#endif

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@
7070
"husky": "9.1.7",
7171
"jest": "29.7.0",
7272
"metro-react-native-babel-preset": "0.77.0",
73-
"nitro-codegen": "0.18.0",
73+
"nitro-codegen": "0.18.1",
7474
"react": "18.3.1",
7575
"react-native": "0.76.3",
7676
"react-native-builder-bob": "0.33.1",
77-
"react-native-nitro-modules": "0.18.0",
77+
"react-native-nitro-modules": "0.18.1",
7878
"react-native-web": "0.19.13",
7979
"react-test-renderer": "18.3.1",
8080
"release-it": "17.6.0",

yarn.lock

+12-12
Original file line numberDiff line numberDiff line change
@@ -7021,7 +7021,7 @@ __metadata:
70217021
react-native: 0.76.3
70227022
react-native-blurhash: 2.1.0
70237023
react-native-edge-to-edge: 1.1.3
7024-
react-native-nitro-modules: 0.18.0
7024+
react-native-nitro-modules: 0.18.1
70257025
react-native-reanimated: 3.16.2
70267026
react-native-unistyles: "workspace:*"
70277027
react-test-renderer: 18.3.1
@@ -11676,18 +11676,18 @@ __metadata:
1167611676
languageName: node
1167711677
linkType: hard
1167811678

11679-
"nitro-codegen@npm:0.18.0":
11680-
version: 0.18.0
11681-
resolution: "nitro-codegen@npm:0.18.0"
11679+
"nitro-codegen@npm:0.18.1":
11680+
version: 0.18.1
11681+
resolution: "nitro-codegen@npm:0.18.1"
1168211682
dependencies:
1168311683
chalk: ^5.3.0
11684-
react-native-nitro-modules: ^0.18.0
11684+
react-native-nitro-modules: ^0.18.1
1168511685
ts-morph: ^24.0.0
1168611686
yargs: ^17.7.2
1168711687
zod: ^3.23.8
1168811688
bin:
1168911689
nitro-codegen: lib/index.js
11690-
checksum: a4add89a98b74f0dfe2ede21e618aad98d27644a9754071aa0e58b9994904944198316503bff32d611a6baee742fd4d5fbfba8182ef9a462e91d9a4659ed464d
11690+
checksum: 956865af3d69a75d2712bbcc29a388446d5dd49f86bd6f5abb80c3254fcb12984e7f46f4eb0f125a2f49b1633c0ceb7406ccb5fee0a2fa89f50ebab2c51cb04e
1169111691
languageName: node
1169211692
linkType: hard
1169311693

@@ -12906,13 +12906,13 @@ __metadata:
1290612906
languageName: node
1290712907
linkType: hard
1290812908

12909-
"react-native-nitro-modules@npm:0.18.0, react-native-nitro-modules@npm:^0.18.0":
12910-
version: 0.18.0
12911-
resolution: "react-native-nitro-modules@npm:0.18.0"
12909+
"react-native-nitro-modules@npm:0.18.1, react-native-nitro-modules@npm:^0.18.1":
12910+
version: 0.18.1
12911+
resolution: "react-native-nitro-modules@npm:0.18.1"
1291212912
peerDependencies:
1291312913
react: "*"
1291412914
react-native: "*"
12915-
checksum: 336989864c032e7335e0ced36106615c6c3d9f0044dde117b591ae94c4a0490a4132d0b1496bea4c05879f3ff71f51938155e50eb2b2999e83750253ca25ee5d
12915+
checksum: 641dd59674e1b0658ef5e66655f71596053dfe179f437f487ad65e95ce44ef8c70c0fdbe6098cb18c1e1f4eb71ec18bb1b7a59e09adeef9ed42552d3517bbc6c
1291612916
languageName: node
1291712917
linkType: hard
1291812918

@@ -12975,11 +12975,11 @@ __metadata:
1297512975
husky: 9.1.7
1297612976
jest: 29.7.0
1297712977
metro-react-native-babel-preset: 0.77.0
12978-
nitro-codegen: 0.18.0
12978+
nitro-codegen: 0.18.1
1297912979
react: 18.3.1
1298012980
react-native: 0.76.3
1298112981
react-native-builder-bob: 0.33.1
12982-
react-native-nitro-modules: 0.18.0
12982+
react-native-nitro-modules: 0.18.1
1298312983
react-native-web: 0.19.13
1298412984
react-test-renderer: 18.3.1
1298512985
release-it: 17.6.0

0 commit comments

Comments
 (0)