Skip to content

Commit 8710fe7

Browse files
committed
Undo os-dependent Logger approach to logging. It's too inconsistently available.
1 parent 4999398 commit 8710fe7

File tree

1 file changed

+26
-20
lines changed

1 file changed

+26
-20
lines changed

bindings/LDK/Bindings.swift

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

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

1313
public typealias LDKTransactionOutputs = LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
1414
public typealias TransactionOutputs = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ
@@ -67,9 +67,9 @@ open class NativeTypeWrapper: Hashable {
6767
public class Bindings {
6868

6969
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
70+
// #if canImport(os)
71+
// internal static let logger = os.Logger(subsystem: Bundle.main.bundleIdentifier!, category: "ldk")
72+
// #endif
7373

7474
public enum PrintSeverity: UInt {
7575
case DEBUG = 0
@@ -79,19 +79,25 @@ public class Bindings {
7979

8080
internal class func print(_ string: String, severity: PrintSeverity = .DEBUG) {
8181
if severity.rawValue >= Self.minimumPrintSeverity.rawValue {
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
82+
Swift.print(string)
83+
// if #available(iOS 14.0, *) {
84+
// #if canImport(os)
85+
// if severity == Self.PrintSeverity.DEBUG {
86+
// logger.debug("\(string)")
87+
// }else if severity == Self.PrintSeverity.WARNING {
88+
// logger.warning("\(string)")
89+
// }else if severity == Self.PrintSeverity.ERROR {
90+
// logger.error("\(string)")
91+
// }else {
92+
// logger.log("\(string)")
93+
// }
94+
// #else
95+
// Swift.print(string)
96+
// #endif
97+
// } else {
98+
// // Fallback on earlier versions
99+
// Swift.print(string)
100+
// }
95101
}
96102
}
97103

@@ -4730,7 +4736,7 @@ withUnsafePointer(to: scorer.cOpaqueStruct!) { (scorerPointer: UnsafePointer<LDK
47304736
*/
47314737

47324738
public class func get_ldk_swift_bindings_version() -> String {
4733-
return "556d959a4572b40920b57394eef4a3c04a514839"
4739+
return "49993985ba4f2dd197deef5f62758b2f8bfa11cc"
47344740
}
47354741

47364742
}

0 commit comments

Comments
 (0)