Skip to content

Commit c57f422

Browse files
committed
gate os import and dependencies
1 parent 034c20c commit c57f422

File tree

2 files changed

+39
-24
lines changed

2 files changed

+39
-24
lines changed

bindings/LDK/Bindings.swift

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
//
77

88
import Foundation
9-
import os
9+
#if canImport(os)
10+
import os
11+
#endif
1012

1113
public typealias LDKTransactionOutputs = LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
1214
public typealias TransactionOutputs = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
@@ -64,9 +66,10 @@ open class NativeTypeWrapper: Hashable {
6466

6567
public class Bindings {
6668

67-
internal static let logger = os.Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ldk")
6869
internal static var minimumPrintSeverity: PrintSeverity = .WARNING
69-
70+
#if canImport(os)
71+
internal static let logger = os.Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ldk")
72+
#endif
7073

7174
public enum PrintSeverity: UInt {
7275
case DEBUG = 0
@@ -76,15 +79,19 @@ public class Bindings {
7679

7780
internal class func print(_ string: String, severity: PrintSeverity = .DEBUG) {
7881
if severity.rawValue >= Self.minimumPrintSeverity.rawValue {
79-
if severity == Self.PrintSeverity.DEBUG {
80-
logger.debug("\(string)")
81-
}else if severity == Self.PrintSeverity.WARNING {
82-
logger.warning("\(string)")
83-
}else if severity == Self.PrintSeverity.ERROR {
84-
logger.error("\(string)")
85-
}else {
86-
logger.log("\(string)")
87-
}
82+
#if canImport(os)
83+
if severity == Self.PrintSeverity.DEBUG {
84+
logger.debug("\(string)")
85+
}else if severity == Self.PrintSeverity.WARNING {
86+
logger.warning("\(string)")
87+
}else if severity == Self.PrintSeverity.ERROR {
88+
logger.error("\(string)")
89+
}else {
90+
logger.log("\(string)")
91+
}
92+
#else
93+
Swift.print(string)
94+
#endif
8895
}
8996
}
9097

@@ -4576,7 +4583,7 @@ withUnsafePointer(to: htlc.cOpaqueStruct!) { (htlcPointer: UnsafePointer<LDKHTLC
45764583
}
45774584

45784585
public class func get_ldk_swift_bindings_version() -> String {
4579-
return "32b7bd5b870675c84f167046cd4e15e754c466b6"
4586+
return "034c20c8e2a658f53ade8a8350a1aa5f36118992"
45804587
}
45814588

45824589
}

templates/BindingsTemplate.swift

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
//
77

88
import Foundation
9-
import os
9+
#if canImport(os)
10+
import os
11+
#endif
1012

1113
public typealias LDKTransactionOutputs = LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
1214
public typealias TransactionOutputs = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
@@ -64,8 +66,10 @@ open class NativeTypeWrapper: Hashable {
6466

6567
public class Bindings {
6668

67-
internal static let logger = os.Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ldk")
6869
internal static var minimumPrintSeverity: PrintSeverity = .WARNING
70+
#if canImport(os)
71+
internal static let logger = os.Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ldk")
72+
#endif
6973

7074
public enum PrintSeverity: UInt {
7175
case DEBUG = 0
@@ -75,15 +79,19 @@ public class Bindings {
7579

7680
internal class func print(_ string: String, severity: PrintSeverity = .DEBUG) {
7781
if severity.rawValue >= Self.minimumPrintSeverity.rawValue {
78-
if severity == Self.PrintSeverity.DEBUG {
79-
logger.debug("\(string)")
80-
}else if severity == Self.PrintSeverity.WARNING {
81-
logger.warning("\(string)")
82-
}else if severity == Self.PrintSeverity.ERROR {
83-
logger.error("\(string)")
84-
}else {
85-
logger.log("\(string)")
86-
}
82+
#if canImport(os)
83+
if severity == Self.PrintSeverity.DEBUG {
84+
logger.debug("\(string)")
85+
}else if severity == Self.PrintSeverity.WARNING {
86+
logger.warning("\(string)")
87+
}else if severity == Self.PrintSeverity.ERROR {
88+
logger.error("\(string)")
89+
}else {
90+
logger.log("\(string)")
91+
}
92+
#else
93+
Swift.print(string)
94+
#endif
8795
}
8896
}
8997

0 commit comments

Comments
 (0)