Skip to content

Commit 8eb016b

Browse files
committed
Swift 6: Added nonisolated to every generated functions
1 parent 55a2c7e commit 8eb016b

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

Sources/ReactBridgeMacros/ReactMethod.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extension ReactMethod: PeerMacro {
4141

4242
static func reactExport(funcName: String, jsName: String, objcName: String, isSync: Bool) -> DeclSyntax {
4343
"""
44-
@objc static func __rct_export__\(raw: funcName)() -> UnsafeRawPointer {
44+
@objc static nonisolated func __rct_export__\(raw: funcName)() -> UnsafeRawPointer {
4545
ReactBridgeUtils.methodInfo(\(raw: jsName), objcName: "\(raw: objcName)", isSync: \(raw: isSync))
4646
}
4747
"""

Sources/ReactBridgeMacros/ReactModule.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,30 +35,30 @@ extension ReactModule: MemberMacro {
3535

3636
static let registerModule: DeclSyntax =
3737
"""
38-
@objc static func _registerModule() {
38+
@objc static nonisolated func _registerModule() {
3939
RCTRegisterModule(self);
4040
}
4141
"""
4242

4343
static func moduleName(name: String, override: Bool = false) -> DeclSyntax {
4444
"""
45-
@objc \(raw: override ? "override " : "")class func moduleName() -> String! {
45+
@objc \(raw: override ? "override " : "")nonisolated class func moduleName() -> String! {
4646
\(raw: name)
4747
}
4848
"""
4949
}
5050

5151
static func requiresMainQueueSetup(value: Bool, override: Bool = false) -> DeclSyntax {
5252
"""
53-
@objc \(raw: override ? "override " : "")class func requiresMainQueueSetup() -> Bool {
53+
@objc \(raw: override ? "override " : "")nonisolated class func requiresMainQueueSetup() -> Bool {
5454
\(raw: value)
5555
}
5656
"""
5757
}
5858

5959
static func methodQueue(queue: String, override: Bool = false) -> DeclSyntax {
6060
"""
61-
@objc \(raw: override ? "override " : "")var methodQueue: DispatchQueue {
61+
@objc \(raw: override ? "override " : "")nonisolated var methodQueue: DispatchQueue {
6262
\(raw: queue)
6363
}
6464
"""

Sources/ReactBridgeMacros/ReactProperty.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extension ReactProperty: PeerMacro {
3535

3636
private static func propConfig(name: String, objcType: String, keyPath: String) -> DeclSyntax {
3737
"""
38-
@objc static func propConfig_\(raw: name)() -> [String] {
38+
@objc static nonisolated func propConfig_\(raw: name)() -> [String] {
3939
["\(raw: objcType)", \(raw: keyPath)]
4040
}
4141
"""

Tests/ReactBridgeTests/ReactBridgeTests.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ final class ReactMethodTests: XCTestCase {
1717

1818
func rct_export(name: String, selector: String, isSync: Bool = false, jsName: String? = nil) -> String {
1919
"""
20-
@objc static func __rct_export__\(name)() -> UnsafeRawPointer {
20+
@objc static nonisolated func __rct_export__\(name)() -> UnsafeRawPointer {
2121
ReactBridgeUtils.methodInfo("\(jsName ?? name)", objcName: "\(selector)", isSync: \(isSync))
2222
}
2323
"""
@@ -314,15 +314,15 @@ final class ReactModuleTests: XCTestCase {
314314
func methods(name: String, requiresMainQueueSetup: Bool = false, override: Bool = false) -> String {
315315
"""
316316
317-
@objc \(override ? "override " : "")class func moduleName() -> String! {
317+
@objc \(override ? "override " : "")nonisolated class func moduleName() -> String! {
318318
"\(name)"
319319
}
320320
321-
@objc \(override ? "override " : "")class func requiresMainQueueSetup() -> Bool {
321+
@objc \(override ? "override " : "")nonisolated class func requiresMainQueueSetup() -> Bool {
322322
\(requiresMainQueueSetup)
323323
}
324324
325-
@objc static func _registerModule() {
325+
@objc static nonisolated func _registerModule() {
326326
RCTRegisterModule(self);
327327
}
328328
"""
@@ -425,7 +425,7 @@ final class ReactModuleTests: XCTestCase {
425425
class A: NSObject, RCTBridgeModule {
426426
\(methods(name: "Module2", requiresMainQueueSetup: true))
427427
428-
@objc var methodQueue: DispatchQueue {
428+
@objc nonisolated var methodQueue: DispatchQueue {
429429
.main
430430
}
431431
}
@@ -442,7 +442,7 @@ final class ReactPropertyTests: XCTestCase {
442442

443443
func propConfig(name: String, objcType: String, keyPath: String? = nil, isCustom: Bool = false) -> String {
444444
"""
445-
@objc static func propConfig_\(name)() -> [String] {
445+
@objc static nonisolated func propConfig_\(name)() -> [String] {
446446
["\(objcType)", "\(isCustom ? "__custom__" : (keyPath ?? name))"]
447447
}
448448
"""
@@ -675,19 +675,19 @@ final class ReactViewTests: XCTestCase {
675675
func methods(name: String) -> String {
676676
"""
677677
678-
@objc static func _registerModule() {
678+
@objc static nonisolated func _registerModule() {
679679
RCTRegisterModule(self);
680680
}
681681
682-
@objc override class func moduleName() -> String! {
682+
@objc override nonisolated class func moduleName() -> String! {
683683
"\(name)"
684684
}
685685
686-
@objc override class func requiresMainQueueSetup() -> Bool {
686+
@objc override nonisolated class func requiresMainQueueSetup() -> Bool {
687687
true
688688
}
689689
690-
@objc override var methodQueue: DispatchQueue {
690+
@objc override nonisolated var methodQueue: DispatchQueue {
691691
.main
692692
}
693693
"""

0 commit comments

Comments
 (0)