fix swift build

couchbase · Jan 6, 2025 · cf652f6 · cf652f6
1 parent a3963f0
commit cf652f6
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 20 deletions.
diff --git a/Objective-C/CBLConsoleLogger.h b/Objective-C/CBLConsoleLogger.h
@@ -22,7 +22,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-__attribute__((deprecated("Use CBLConsoleLogSink instead.")))
+__deprecated_msg("Use CBLConsoleLogSink instead.");
 /** Console logger for writing log messages to the system console. */
 @interface CBLConsoleLogger : NSObject <CBLLogger>
 

diff --git a/Objective-C/CBLFileLogger.h b/Objective-C/CBLFileLogger.h
@@ -24,7 +24,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-__attribute__((deprecated("Use CBLFileLogSink instead.")))
+__deprecated_msg("Use CBLFileLogSink instead.");
 /**
  File logger used for writing log messages to files. To enable the file logger,
  setup the log file configuration and specifiy the log level as desired.

diff --git a/Objective-C/CBLLog.h b/Objective-C/CBLLog.h
@@ -25,7 +25,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-__attribute__((deprecated("Use CBLLogSinks instead.")))
+__deprecated_msg("Use CBLLogSinks instead.");
 /**
  Log allows to configure console and file logger or to set a custom logger.
  */

diff --git a/Objective-C/CBLLog.mm b/Objective-C/CBLLog.mm
@@ -25,7 +25,7 @@
 
 // For bridging custom logger between Swift and Objective-C
 // without making CBLLogger protocol public
-__attribute__((deprecated("Use CBLCustomLogSink instead.")))
+__deprecated_msg("Use CBLCustomLogSink instead.");
 @interface CBLCustomLogger : NSObject <CBLLogger>
 - (instancetype) initWithLevel: (CBLLogLevel)level logger: (CBLCustomLoggerBlock)logger;
 @end

diff --git a/Objective-C/CBLLogFileConfiguration.h b/Objective-C/CBLLogFileConfiguration.h
@@ -21,7 +21,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-__attribute__((deprecated("Use CBLFileLogSink instead.")))
+__deprecated_msg("Use CBLFileLogSink instead.");
 /**
  Log file configuration.
  */

diff --git a/Objective-C/CBLLogger.h b/Objective-C/CBLLogger.h
@@ -19,13 +19,12 @@
 
 #import <CouchbaseLite/CBLLogTypes.h>
 
-__attribute__((deprecated("Use CBLLogSinkProtocol instead.")))
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
  Logger protocol
  */
+__deprecated_msg("Use CBLLogSinkProtocol instead.");
 @protocol CBLLogger <NSObject>
 
 /** The minimum log level to be logged. */

diff --git a/Swift/Defaults.swift b/Swift/Defaults.swift
@@ -49,19 +49,6 @@ public extension LogFileConfiguration {
 
 }
 
-public extension FileLogSink {
-
-    /// [false] Plaintext is not used, and instead binary encoding is used in log files
-    static let defaultUsePlaintext: Bool = false
-
-    /// [524288] 512 KiB for the size of a log file
-    static let defaultMaxSize: UInt64 = 524288
-
-    /// [2] 2 files preserved during each log rotation
-    static let defaultMaxKeptFiles: Int = 2
-
-}
-
 public extension FullTextIndexConfiguration {
 
     /// [false] Accents and ligatures are not ignored when indexing via full text search