react-native-candle 0.1.13 → 0.1.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ReactNativeCandle.podspec +1 -42
- package/ios/Sources/RNCandle.swift +4 -6
- package/lib/typescript/commonjs/src/specs/RNCandle.nitro.d.ts +1 -0
- package/lib/typescript/commonjs/src/specs/RNCandle.nitro.d.ts.map +1 -1
- package/lib/typescript/module/src/specs/RNCandle.nitro.d.ts +1 -0
- package/lib/typescript/module/src/specs/RNCandle.nitro.d.ts.map +1 -1
- package/nitrogen/generated/ios/swift/AppUser.swift +33 -2
- package/nitrogen/generated/shared/c++/AppUser.hpp +7 -2
- package/package.json +1 -1
- package/plugin/withIosDeploymentTarget.js +2 -152
- package/src/specs/RNCandle.nitro.ts +1 -0
|
@@ -22,47 +22,6 @@ Pod::Spec.new do |s|
|
|
|
22
22
|
"cpp/**/*.{hpp,cpp}",
|
|
23
23
|
]
|
|
24
24
|
|
|
25
|
-
spm_dependency(s,
|
|
26
|
-
url: "https://github.com/candlefinance/swift-security",
|
|
27
|
-
requirement: {
|
|
28
|
-
"kind": "branch",
|
|
29
|
-
"branch": "main"
|
|
30
|
-
},
|
|
31
|
-
products: ["SwiftSecurity"]
|
|
32
|
-
)
|
|
33
|
-
spm_dependency(s,
|
|
34
|
-
url: "https://github.com/apple/swift-openapi-urlsession",
|
|
35
|
-
requirement: {
|
|
36
|
-
"kind": "exactVersion",
|
|
37
|
-
"version": "1.0.2"
|
|
38
|
-
},
|
|
39
|
-
products: ["OpenAPIURLSession"]
|
|
40
|
-
)
|
|
41
|
-
spm_dependency(s,
|
|
42
|
-
url: "https://github.com/apple/swift-nio",
|
|
43
|
-
requirement: {
|
|
44
|
-
"kind": "exactVersion",
|
|
45
|
-
"version": "2.81.0"
|
|
46
|
-
},
|
|
47
|
-
products: ["NIO", "NIOHTTP1", "NIOWebSocket"]
|
|
48
|
-
)
|
|
49
|
-
spm_dependency(s,
|
|
50
|
-
url: "https://github.com/apple/swift-nio-ssl",
|
|
51
|
-
requirement: {
|
|
52
|
-
"kind": "exactVersion",
|
|
53
|
-
"version": "2.29.3"
|
|
54
|
-
},
|
|
55
|
-
products: ["NIOSSL"]
|
|
56
|
-
)
|
|
57
|
-
spm_dependency(s,
|
|
58
|
-
url: "https://github.com/apple/swift-nio-transport-services",
|
|
59
|
-
requirement: {
|
|
60
|
-
"kind": "exactVersion",
|
|
61
|
-
"version": "1.23.1"
|
|
62
|
-
},
|
|
63
|
-
products: ["NIOTransportServices"]
|
|
64
|
-
)
|
|
65
|
-
|
|
66
25
|
s.pod_target_xcconfig = {
|
|
67
26
|
# C++ compiler flags, mainly for folly.
|
|
68
27
|
"GCC_PREPROCESSOR_DEFINITIONS" => "$(inherited) FOLLY_NO_CONFIG FOLLY_CFG_NO_COROUTINES"
|
|
@@ -71,7 +30,7 @@ Pod::Spec.new do |s|
|
|
|
71
30
|
load 'nitrogen/generated/ios/ReactNativeCandle+autolinking.rb'
|
|
72
31
|
add_nitrogen_files(s)
|
|
73
32
|
|
|
74
|
-
s.dependency 'Candle', '3.0.
|
|
33
|
+
s.dependency 'Candle', '3.0.234-beta'
|
|
75
34
|
s.dependency 'React-jsi'
|
|
76
35
|
s.dependency 'React-callinvoker'
|
|
77
36
|
install_modules_dependencies(s)
|
|
@@ -26,7 +26,8 @@ final class HybridRNCandle: HybridRNCandleSpec {
|
|
|
26
26
|
public func initialize(appUser: AppUser) throws {
|
|
27
27
|
Task { @MainActor in
|
|
28
28
|
let wrapperView = CandleLinkSheetWrapper(
|
|
29
|
-
appUser: .init(
|
|
29
|
+
appUser: .init(
|
|
30
|
+
appKey: appUser.appKey, appSecret: appUser.appSecret, appUserID: appUser.appUserID))
|
|
30
31
|
let hostingVC = HostingViewController(uiView: wrapperView)
|
|
31
32
|
self.rootVC = hostingVC
|
|
32
33
|
guard let rootViewController = UIApplication.keyWindow?.rootViewController,
|
|
@@ -97,16 +98,13 @@ final class HybridRNCandle: HybridRNCandleSpec {
|
|
|
97
98
|
|
|
98
99
|
public func getFiatAccounts() throws -> Promise<String> {
|
|
99
100
|
.async {
|
|
100
|
-
|
|
101
|
-
return try self.encodeToJSONString(accounts)
|
|
101
|
+
return ""
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
public func getActivity(span: String?) throws -> Promise<String> {
|
|
106
106
|
.async {
|
|
107
|
-
|
|
108
|
-
try await self.viewModel.candleClient.getActivity(query: .init(span: span))
|
|
109
|
-
return try self.encodeToJSONString(activity)
|
|
107
|
+
return ""
|
|
110
108
|
}
|
|
111
109
|
}
|
|
112
110
|
|
|
@@ -2,6 +2,7 @@ import type { AnyMap, HybridObject } from "react-native-nitro-modules";
|
|
|
2
2
|
export type AppUser = {
|
|
3
3
|
appKey: string;
|
|
4
4
|
appSecret: string;
|
|
5
|
+
appUserID?: string;
|
|
5
6
|
};
|
|
6
7
|
export type Service = "robinhood" | "cash_app" | "venmo" | "apple" | "sandbox" | "uber" | "lyft" | "chime" | "paypal" | "coinbase" | "discover" | "american_express" | "jpmorgan_chase" | "bank_of_america" | "capital_one" | "citibank" | "vanguard" | "wells_fargo" | "charles_schwab" | "kalshi" | "experian" | "waymo" | "revel" | "turo" | "getaround" | "zipcar" | "airbnb" | "american_airlines" | "delta" | "united" | "jetblue" | "southwest" | "hawaiian" | "hotels" | "geico" | "progressive" | "aaa" | "state_farm" | "hertz" | "avis" | "tesla" | "doordash" | "uber_eats" | "grubhub" | "resy" | "opentable" | "starbucks" | "blue_bottle" | "costco" | "amazon" | "walmart" | "whole_foods" | "mcdonalds" | "chipotle" | "sweetgreen" | "snapchat" | "x" | "facebook" | "instagram" | "signal" | "whatsapp" | "messenger" | "linkedin" | "discord" | "messages" | "telegram" | "reddit" | "pinterest" | "new_york_times" | "washington_post" | "wall_street_journal" | "cnn" | "yahoo" | "fox" | "perplexity" | "openai" | "polymarket" | "espn" | "youtube" | "netflix";
|
|
7
8
|
export type PresentationBackground = "default" | "blur";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RNCandle.nitro.d.ts","sourceRoot":"","sources":["../../../../../src/specs/RNCandle.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEvE,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"RNCandle.nitro.d.ts","sourceRoot":"","sources":["../../../../../src/specs/RNCandle.nitro.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import type { AnyMap, HybridObject } from "react-native-nitro-modules";
|
|
|
2
2
|
export type AppUser = {
|
|
3
3
|
appKey: string;
|
|
4
4
|
appSecret: string;
|
|
5
|
+
appUserID?: string;
|
|
5
6
|
};
|
|
6
7
|
export type Service = "robinhood" | "cash_app" | "venmo" | "apple" | "sandbox" | "uber" | "lyft" | "chime" | "paypal" | "coinbase" | "discover" | "american_express" | "jpmorgan_chase" | "bank_of_america" | "capital_one" | "citibank" | "vanguard" | "wells_fargo" | "charles_schwab" | "kalshi" | "experian" | "waymo" | "revel" | "turo" | "getaround" | "zipcar" | "airbnb" | "american_airlines" | "delta" | "united" | "jetblue" | "southwest" | "hawaiian" | "hotels" | "geico" | "progressive" | "aaa" | "state_farm" | "hertz" | "avis" | "tesla" | "doordash" | "uber_eats" | "grubhub" | "resy" | "opentable" | "starbucks" | "blue_bottle" | "costco" | "amazon" | "walmart" | "whole_foods" | "mcdonalds" | "chipotle" | "sweetgreen" | "snapchat" | "x" | "facebook" | "instagram" | "signal" | "whatsapp" | "messenger" | "linkedin" | "discord" | "messages" | "telegram" | "reddit" | "pinterest" | "new_york_times" | "washington_post" | "wall_street_journal" | "cnn" | "yahoo" | "fox" | "perplexity" | "openai" | "polymarket" | "espn" | "youtube" | "netflix";
|
|
7
8
|
export type PresentationBackground = "default" | "blur";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RNCandle.nitro.d.ts","sourceRoot":"","sources":["../../../../../src/specs/RNCandle.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAEvE,MAAM,MAAM,OAAO,GAAG;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"RNCandle.nitro.d.ts","sourceRoot":"","sources":["../../../../../src/specs/RNCandle.nitro.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,8 +16,16 @@ extension AppUser {
|
|
|
16
16
|
/**
|
|
17
17
|
* Create a new instance of `AppUser`.
|
|
18
18
|
*/
|
|
19
|
-
public init(appKey: String, appSecret: String) {
|
|
20
|
-
self.init(
|
|
19
|
+
public init(appKey: String, appSecret: String, appUserID: String?) {
|
|
20
|
+
self.init(
|
|
21
|
+
std.string(appKey), std.string(appSecret),
|
|
22
|
+
{ () -> bridge.std__optional_std__string_ in
|
|
23
|
+
if let __unwrappedValue = appUserID {
|
|
24
|
+
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
25
|
+
} else {
|
|
26
|
+
return .init()
|
|
27
|
+
}
|
|
28
|
+
}())
|
|
21
29
|
}
|
|
22
30
|
|
|
23
31
|
public var appKey: String {
|
|
@@ -41,4 +49,27 @@ extension AppUser {
|
|
|
41
49
|
self.__appSecret = std.string(newValue)
|
|
42
50
|
}
|
|
43
51
|
}
|
|
52
|
+
|
|
53
|
+
public var appUserID: String? {
|
|
54
|
+
@inline(__always)
|
|
55
|
+
get {
|
|
56
|
+
return { () -> String? in
|
|
57
|
+
if let __unwrapped = self.__appUserID.value {
|
|
58
|
+
return String(__unwrapped)
|
|
59
|
+
} else {
|
|
60
|
+
return nil
|
|
61
|
+
}
|
|
62
|
+
}()
|
|
63
|
+
}
|
|
64
|
+
@inline(__always)
|
|
65
|
+
set {
|
|
66
|
+
self.__appUserID = { () -> bridge.std__optional_std__string_ in
|
|
67
|
+
if let __unwrappedValue = newValue {
|
|
68
|
+
return bridge.create_std__optional_std__string_(std.string(__unwrappedValue))
|
|
69
|
+
} else {
|
|
70
|
+
return .init()
|
|
71
|
+
}
|
|
72
|
+
}()
|
|
73
|
+
}
|
|
74
|
+
}
|
|
44
75
|
}
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
|
|
22
22
|
|
|
23
23
|
#include <string>
|
|
24
|
+
#include <optional>
|
|
24
25
|
|
|
25
26
|
namespace margelo::nitro::rncandle {
|
|
26
27
|
|
|
@@ -31,10 +32,11 @@ namespace margelo::nitro::rncandle {
|
|
|
31
32
|
public:
|
|
32
33
|
std::string appKey SWIFT_PRIVATE;
|
|
33
34
|
std::string appSecret SWIFT_PRIVATE;
|
|
35
|
+
std::optional<std::string> appUserID SWIFT_PRIVATE;
|
|
34
36
|
|
|
35
37
|
public:
|
|
36
38
|
AppUser() = default;
|
|
37
|
-
explicit AppUser(std::string appKey, std::string appSecret): appKey(appKey), appSecret(appSecret) {}
|
|
39
|
+
explicit AppUser(std::string appKey, std::string appSecret, std::optional<std::string> appUserID): appKey(appKey), appSecret(appSecret), appUserID(appUserID) {}
|
|
38
40
|
};
|
|
39
41
|
|
|
40
42
|
} // namespace margelo::nitro::rncandle
|
|
@@ -50,13 +52,15 @@ namespace margelo::nitro {
|
|
|
50
52
|
jsi::Object obj = arg.asObject(runtime);
|
|
51
53
|
return AppUser(
|
|
52
54
|
JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "appKey")),
|
|
53
|
-
JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "appSecret"))
|
|
55
|
+
JSIConverter<std::string>::fromJSI(runtime, obj.getProperty(runtime, "appSecret")),
|
|
56
|
+
JSIConverter<std::optional<std::string>>::fromJSI(runtime, obj.getProperty(runtime, "appUserID"))
|
|
54
57
|
);
|
|
55
58
|
}
|
|
56
59
|
static inline jsi::Value toJSI(jsi::Runtime& runtime, const AppUser& arg) {
|
|
57
60
|
jsi::Object obj(runtime);
|
|
58
61
|
obj.setProperty(runtime, "appKey", JSIConverter<std::string>::toJSI(runtime, arg.appKey));
|
|
59
62
|
obj.setProperty(runtime, "appSecret", JSIConverter<std::string>::toJSI(runtime, arg.appSecret));
|
|
63
|
+
obj.setProperty(runtime, "appUserID", JSIConverter<std::optional<std::string>>::toJSI(runtime, arg.appUserID));
|
|
60
64
|
return obj;
|
|
61
65
|
}
|
|
62
66
|
static inline bool canConvert(jsi::Runtime& runtime, const jsi::Value& value) {
|
|
@@ -66,6 +70,7 @@ namespace margelo::nitro {
|
|
|
66
70
|
jsi::Object obj = value.getObject(runtime);
|
|
67
71
|
if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "appKey"))) return false;
|
|
68
72
|
if (!JSIConverter<std::string>::canConvert(runtime, obj.getProperty(runtime, "appSecret"))) return false;
|
|
73
|
+
if (!JSIConverter<std::optional<std::string>>::canConvert(runtime, obj.getProperty(runtime, "appUserID"))) return false;
|
|
69
74
|
return true;
|
|
70
75
|
}
|
|
71
76
|
};
|
package/package.json
CHANGED
|
@@ -20,12 +20,6 @@ const plugin = (config, options = {}) => {
|
|
|
20
20
|
},
|
|
21
21
|
],
|
|
22
22
|
],
|
|
23
|
-
[
|
|
24
|
-
withXcodeProject,
|
|
25
|
-
async (config) => {
|
|
26
|
-
return withMyCustomBuildPhase(config);
|
|
27
|
-
},
|
|
28
|
-
],
|
|
29
23
|
]);
|
|
30
24
|
};
|
|
31
25
|
|
|
@@ -56,18 +50,9 @@ const withIosDeploymentTarget = async (config) => {
|
|
|
56
50
|
}
|
|
57
51
|
|
|
58
52
|
const setPreInstallHook = mergeContents({
|
|
59
|
-
tag: "
|
|
53
|
+
tag: "",
|
|
60
54
|
src: setDeploymentTarget.contents,
|
|
61
|
-
newSrc:
|
|
62
|
-
installer.pod_targets.each do |pod|
|
|
63
|
-
if pod.name.eql?('RNReanimated')
|
|
64
|
-
def pod.build_type;
|
|
65
|
-
# This is a workaround for the issue with the dynamic library
|
|
66
|
-
Pod::BuildType.static_library;
|
|
67
|
-
end
|
|
68
|
-
end
|
|
69
|
-
end
|
|
70
|
-
end`,
|
|
55
|
+
newSrc: ``,
|
|
71
56
|
anchor: /post_install do \|installer\|/i,
|
|
72
57
|
offset: 0,
|
|
73
58
|
comment: "#",
|
|
@@ -83,139 +68,4 @@ const withIosDeploymentTarget = async (config) => {
|
|
|
83
68
|
return config;
|
|
84
69
|
};
|
|
85
70
|
|
|
86
|
-
// This function adds a custom build phase to the Xcode project
|
|
87
|
-
// that removes signature files from the build directory
|
|
88
|
-
// for Xcode 15 and 16. This is a workaround for a known issue
|
|
89
|
-
// with these versions of Xcode.
|
|
90
|
-
// I think it's because of the duplicate symbol issue.
|
|
91
|
-
const withMyCustomBuildPhase = async (config) => {
|
|
92
|
-
// Duplicate symbols issue
|
|
93
|
-
const xcodeProject = config.modResults;
|
|
94
|
-
const shellScript = `if { [ "$XCODE_VERSION_MAJOR" = "1500" ] || [ "$XCODE_VERSION_MAJOR" = "1600" ]; } && [ "$CONFIGURATION" = "Release" ]; then
|
|
95
|
-
echo "Remove signature files (Xcode 15/16 workaround, only in Release)"
|
|
96
|
-
find "$BUILD_DIR/\${CONFIGURATION}-iphoneos" -name "*.signature" -type f | xargs -r rm
|
|
97
|
-
fi`;
|
|
98
|
-
|
|
99
|
-
xcodeProject.addBuildPhase(
|
|
100
|
-
[],
|
|
101
|
-
"PBXShellScriptBuildPhase",
|
|
102
|
-
"Remove Framework signature files (Xcode 15/16 workaround)",
|
|
103
|
-
null,
|
|
104
|
-
{
|
|
105
|
-
shellPath: "/bin/sh",
|
|
106
|
-
shellScript,
|
|
107
|
-
runOnlyForDeploymentPostprocessing: 1,
|
|
108
|
-
}
|
|
109
|
-
);
|
|
110
|
-
|
|
111
|
-
// reference the "props"
|
|
112
|
-
// const { version, repositoryUrl, repoName, productName } = {
|
|
113
|
-
// repositoryUrl: "https://github.com/candlefinance/candle-swift",
|
|
114
|
-
// repoName: "candle-swift",
|
|
115
|
-
// productName: "Candle",
|
|
116
|
-
// version: "fa0db96e9a73740bbd4977160894a45c6db96f51",
|
|
117
|
-
// };
|
|
118
|
-
// // get XCRemoteSwiftPackageReference section
|
|
119
|
-
// const spmReferences =
|
|
120
|
-
// xcodeProject.hash.project.objects["XCRemoteSwiftPackageReference"];
|
|
121
|
-
// // if doesn't exist (this is our first SPM package) create empty object
|
|
122
|
-
// if (!spmReferences) {
|
|
123
|
-
// xcodeProject.hash.project.objects["XCRemoteSwiftPackageReference"] = {};
|
|
124
|
-
// }
|
|
125
|
-
// // generate new ID
|
|
126
|
-
// const packageReferenceUUID = xcodeProject.generateUuid();
|
|
127
|
-
// // add XCRemoteSwiftPackageReference section
|
|
128
|
-
// xcodeProject.hash.project.objects["XCRemoteSwiftPackageReference"][
|
|
129
|
-
// `${packageReferenceUUID} /* XCRemoteSwiftPackageReference "${repoName}" */`
|
|
130
|
-
// ] = {
|
|
131
|
-
// isa: "XCRemoteSwiftPackageReference",
|
|
132
|
-
// repositoryURL: repositoryUrl,
|
|
133
|
-
// requirement: {
|
|
134
|
-
// kind: "revision",
|
|
135
|
-
// revision: version,
|
|
136
|
-
// },
|
|
137
|
-
// };
|
|
138
|
-
|
|
139
|
-
// get XCSwiftPackageProductDependency section
|
|
140
|
-
// const spmProducts =
|
|
141
|
-
// xcodeProject.hash.project.objects["XCSwiftPackageProductDependency"];
|
|
142
|
-
// // if doesn't exist (this is our first SPM package) create empty object
|
|
143
|
-
// if (!spmProducts) {
|
|
144
|
-
// xcodeProject.hash.project.objects["XCSwiftPackageProductDependency"] = {};
|
|
145
|
-
// }
|
|
146
|
-
// // generate new ID
|
|
147
|
-
// const packageUUID = xcodeProject.generateUuid();
|
|
148
|
-
// // add XCSwiftPackageProductDependency section
|
|
149
|
-
// xcodeProject.hash.project.objects["XCSwiftPackageProductDependency"][
|
|
150
|
-
// `${packageUUID} /* ${productName} */`
|
|
151
|
-
// ] = {
|
|
152
|
-
// isa: "XCSwiftPackageProductDependency",
|
|
153
|
-
// // from step before
|
|
154
|
-
// package: `${packageReferenceUUID} /* XCRemoteSwiftPackageReference "${repoName}" */`,
|
|
155
|
-
// productName: productName,
|
|
156
|
-
// };
|
|
157
|
-
|
|
158
|
-
// get main project ID
|
|
159
|
-
// const projectId = Object.keys(
|
|
160
|
-
// xcodeProject.hash.project.objects["PBXProject"]
|
|
161
|
-
// ).at(0);
|
|
162
|
-
// // create empty array for package references if it doesn't exist
|
|
163
|
-
// if (
|
|
164
|
-
// !xcodeProject.hash.project.objects["PBXProject"][projectId][
|
|
165
|
-
// "packageReferences"
|
|
166
|
-
// ]
|
|
167
|
-
// ) {
|
|
168
|
-
// xcodeProject.hash.project.objects["PBXProject"][projectId][
|
|
169
|
-
// "packageReferences"
|
|
170
|
-
// ] = [];
|
|
171
|
-
// }
|
|
172
|
-
// // add our package reference (use ID from first step)
|
|
173
|
-
// xcodeProject.hash.project.objects["PBXProject"][projectId][
|
|
174
|
-
// "packageReferences"
|
|
175
|
-
// ] = [
|
|
176
|
-
// ...xcodeProject.hash.project.objects["PBXProject"][projectId][
|
|
177
|
-
// "packageReferences"
|
|
178
|
-
// ],
|
|
179
|
-
// `${packageReferenceUUID} /* XCRemoteSwiftPackageReference "${repoName}" */`,
|
|
180
|
-
// ];
|
|
181
|
-
|
|
182
|
-
// // generate new ID
|
|
183
|
-
// const frameworkUUID = xcodeProject.generateUuid();
|
|
184
|
-
// // add comment and reference to our framework in PBXBuildFile section
|
|
185
|
-
// xcodeProject.hash.project.objects["PBXBuildFile"][
|
|
186
|
-
// `${frameworkUUID}_comment`
|
|
187
|
-
// ] = `${productName} in Frameworks`;
|
|
188
|
-
// xcodeProject.hash.project.objects["PBXBuildFile"][frameworkUUID] = {
|
|
189
|
-
// isa: "PBXBuildFile",
|
|
190
|
-
// productRef: packageUUID,
|
|
191
|
-
// productRef_comment: productName,
|
|
192
|
-
// };
|
|
193
|
-
|
|
194
|
-
// // get first build phase
|
|
195
|
-
// const buildPhaseId = Object.keys(
|
|
196
|
-
// xcodeProject.hash.project.objects["PBXFrameworksBuildPhase"]
|
|
197
|
-
// ).at(0);
|
|
198
|
-
// // create empty array for files if it doesn't exist
|
|
199
|
-
// if (
|
|
200
|
-
// !xcodeProject.hash.project.objects["PBXFrameworksBuildPhase"][buildPhaseId][
|
|
201
|
-
// "files"
|
|
202
|
-
// ]
|
|
203
|
-
// ) {
|
|
204
|
-
// xcodeProject.hash.project.objects["PBXFrameworksBuildPhase"][buildPhaseId][
|
|
205
|
-
// "files"
|
|
206
|
-
// ] = [];
|
|
207
|
-
// }
|
|
208
|
-
// // add our framework reference (use ID from step 4)
|
|
209
|
-
// xcodeProject.hash.project.objects["PBXFrameworksBuildPhase"][buildPhaseId][
|
|
210
|
-
// "files"
|
|
211
|
-
// ] = [
|
|
212
|
-
// ...xcodeProject.hash.project.objects["PBXFrameworksBuildPhase"][
|
|
213
|
-
// buildPhaseId
|
|
214
|
-
// ]["files"],
|
|
215
|
-
// `${frameworkUUID} /* ${productName} in Frameworks */`,
|
|
216
|
-
// ];
|
|
217
|
-
|
|
218
|
-
return config;
|
|
219
|
-
};
|
|
220
|
-
|
|
221
71
|
module.exports = plugin;
|