From c065abc584e66429911a387d5601674740259abc Mon Sep 17 00:00:00 2001 From: Morgan Pretty Date: Mon, 8 Apr 2024 14:14:13 +1000 Subject: [PATCH] Cleaned up a bunch of warnings, renamed a couple of folders --- Session.xcodeproj/project.pbxproj | 66 ++++++++++++++----- .../xcshareddata/xcschemes/Session.xcscheme | 2 +- .../xcschemes/SessionMessagingKit.xcscheme | 2 +- ...ssionNotificationServiceExtension.xcscheme | 2 +- .../xcschemes/SessionShareExtension.xcscheme | 2 +- .../xcschemes/SessionUtilitiesKit.xcscheme | 2 +- .../xcschemes/SignalUtilitiesKit.xcscheme | 2 +- .../EmojiPickerCollectionView.swift | 7 +- .../DisappearingMessageTimerView.swift | 2 +- Session/Emoji/Emoji+Available.swift | 4 ++ .../GIFs/GifPickerViewController.swift | 2 +- .../GIFs/GiphyDownloader.swift | 2 + Session/Utilities/IP2Country.swift | 4 ++ .../Database/Models/Capability.swift | 2 + .../File Server/FileServerAPI.swift | 2 + .../Jobs/Types/GarbageCollectionJob.swift | 4 +- .../Config Handling/LibSession+Contacts.swift | 0 .../LibSession+ConvoInfoVolatile.swift | 0 .../Config Handling/LibSession+Shared.swift | 0 .../LibSession+UserGroups.swift | 0 .../LibSession+UserProfile.swift | 0 .../QueryInterfaceRequest+Utilities.swift | 0 .../Database/Setting+Utilities.swift | 0 .../LibSession+SessionMessagingKit.swift | 24 +++---- .../DataExtractionNotification.swift | 2 + .../Models/UnsubscribeRequest.swift | 2 + .../Pollers/ClosedGroupPoller.swift | 2 + .../Utilities/DeviceSleepManager.swift | 2 + .../LibSessionSpec.swift | 0 .../LibSessionUtilSpec.swift | 0 ...ibSessionTypeConversionUtilitiesSpec.swift | 0 .../_001_InitialSetupMigration.swift | 2 + .../LibSession+Networking.swift | 0 .../Models/DeleteAllBeforeRequest.swift | 2 + .../Models/UpdateExpiryAllRequest.swift | 2 + .../Models/UpdateExpiryRequest.swift | 2 + SessionUIKit/Style Guide/Fonts.swift | 4 ++ .../Utilities/Database+Utilities.swift | 2 + SessionUtilitiesKit/General/AppContext.swift | 2 +- .../General/Array+Utilities.swift | 2 + .../General/Data+Utilities.swift | 2 + .../AttachmentCaptionToolbar.swift | 2 +- .../AttachmentTextToolbar.swift | 2 +- .../ImageEditorTextViewController.swift | 4 +- .../Image Editing/ImageEditorTransform.swift | 2 +- SignalUtilitiesKit/Utilities/Bench.swift | 2 + 46 files changed, 122 insertions(+), 49 deletions(-) rename SessionMessagingKit/{SessionUtil => LibSession}/Config Handling/LibSession+Contacts.swift (100%) rename SessionMessagingKit/{SessionUtil => LibSession}/Config Handling/LibSession+ConvoInfoVolatile.swift (100%) rename SessionMessagingKit/{SessionUtil => LibSession}/Config Handling/LibSession+Shared.swift (100%) rename SessionMessagingKit/{SessionUtil => LibSession}/Config Handling/LibSession+UserGroups.swift (100%) rename SessionMessagingKit/{SessionUtil => LibSession}/Config Handling/LibSession+UserProfile.swift (100%) rename SessionMessagingKit/{SessionUtil => LibSession}/Database/QueryInterfaceRequest+Utilities.swift (100%) rename SessionMessagingKit/{SessionUtil => LibSession}/Database/Setting+Utilities.swift (100%) rename SessionMessagingKit/{SessionUtil => LibSession}/LibSession+SessionMessagingKit.swift (97%) rename SessionMessagingKitTests/{LibSessionUtil => LibSession}/LibSessionSpec.swift (100%) rename SessionMessagingKitTests/{LibSessionUtil => LibSession}/LibSessionUtilSpec.swift (100%) rename SessionMessagingKitTests/{LibSessionUtil => LibSession}/Utilities/LibSessionTypeConversionUtilitiesSpec.swift (100%) rename SessionSnodeKit/{SessionUtil => LibSession}/LibSession+Networking.swift (100%) diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 0fb27ac19..4d7818b6a 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -180,8 +180,6 @@ 9422EE2B2B8C3A97004C740D /* String+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */; }; 943C6D822B75E061004ACE64 /* Message+DisappearingMessages.swift in Sources */ = {isa = PBXBuildFile; fileRef = 943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */; }; 94B3DC172AF8592200C88531 /* QuoteView_SwiftUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */; }; - 9593A1E796C9E6BE2352EA6F /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionSnodeKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8B0BA5257C58DC6FF797278 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionSnodeKit.framework */; }; - 99978E3F7A80275823CA9014 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 29E827FDF6C1032BB985740C /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_SessionNotificationServiceExtension.framework */; }; A11CD70D17FA230600A2D1B1 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */; }; A163E8AB16F3F6AA0094D68B /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A163E8AA16F3F6A90094D68B /* Security.framework */; }; A1C32D5017A06538000A904E /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A1C32D4F17A06537000A904E /* AddressBookUI.framework */; }; @@ -809,7 +807,6 @@ FDA8EAFE280E8B78002B68E5 /* FailedMessageSendsJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDA8EAFD280E8B78002B68E5 /* FailedMessageSendsJob.swift */; }; FDA8EB00280E8D58002B68E5 /* FailedAttachmentDownloadsJob.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDA8EAFF280E8D58002B68E5 /* FailedAttachmentDownloadsJob.swift */; }; FDA8EB10280F8238002B68E5 /* Codable+Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDA8EB0F280F8238002B68E5 /* Codable+Utilities.swift */; }; - FDAED05C2A7C6CE600091B25 /* MigrationRequirement.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDAED05B2A7C6CE600091B25 /* MigrationRequirement.swift */; }; FDB4BBC72838B91E00B7C95D /* LinkPreviewError.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDB4BBC62838B91E00B7C95D /* LinkPreviewError.swift */; }; FDB4BBC92839BEF000B7C95D /* ProfileManagerError.swift in Sources */ = {isa = PBXBuildFile; fileRef = FDB4BBC82839BEF000B7C95D /* ProfileManagerError.swift */; }; FDB6A87C2AD75B7F002D4F96 /* PhotosUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FDB6A87B2AD75B7F002D4F96 /* PhotosUI.framework */; }; @@ -1374,10 +1371,10 @@ 91271A534D1D4AB949B1319E /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension.app store release.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-SessionNotificationServiceExtension.app store release.xcconfig"; sourceTree = ""; }; 9422EE2A2B8C3A97004C740D /* String+Utilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Utilities.swift"; sourceTree = ""; }; 943C6D812B75E061004ACE64 /* Message+DisappearingMessages.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Message+DisappearingMessages.swift"; sourceTree = ""; }; + 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuoteView_SwiftUI.swift; sourceTree = ""; }; 987AE169AEA3246E4C0897B1 /* Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionShareExtension.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GlobalDependencies_FrameworkAndExtensionDependencies_ExtendedDependencies_SessionShareExtension.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 998762BFD08C2415FE71186C /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionUtilitiesKit.debug.xcconfig"; sourceTree = ""; }; 9DE2662E4E5838CD8E1AF35F /* Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionShareExtension.app store release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionShareExtension.app store release.xcconfig"; path = "Target Support Files/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionShareExtension/Pods-GlobalDependencies-FrameworkAndExtensionDependencies-ExtendedDependencies-SessionShareExtension.app store release.xcconfig"; sourceTree = ""; }; - 94B3DC162AF8592200C88531 /* QuoteView_SwiftUI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuoteView_SwiftUI.swift; sourceTree = ""; }; A11CD70C17FA230600A2D1B1 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; A163E8AA16F3F6A90094D68B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; A1C32D4D17A0652C000A904E /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; }; @@ -3405,7 +3402,7 @@ FDF8488F29405C13007DCAE5 /* Types */, FDF8488C29405C04007DCAE5 /* Jobs */, FDF8489229405C1B007DCAE5 /* Networking */, - FD7F74682BAB8A5D006DDFD8 /* SessionUtil */, + FD7F74682BAB8A5D006DDFD8 /* LibSession */, C3C2A5CD255385F300C340D1 /* Utilities */, C3C2A5B9255385ED00C340D1 /* Configuration.swift */, ); @@ -3471,7 +3468,7 @@ C3A7215C2558C0AC0043A11F /* File Server */, C3A721332558BDDF0043A11F /* Open Groups */, C300A5F02554B08500555489 /* Sending & Receiving */, - FD8ECF7529340F4800C0D1BB /* SessionUtil */, + FD8ECF7529340F4800C0D1BB /* LibSession */, FD3E0C82283B581F002A425C /* Shared Models */, C3BBE0B32554F0D30050F1E3 /* Utilities */, FD245C612850664300B966DD /* Configuration.swift */, @@ -4195,12 +4192,12 @@ path = Utilities; sourceTree = ""; }; - FD7F74682BAB8A5D006DDFD8 /* SessionUtil */ = { + FD7F74682BAB8A5D006DDFD8 /* LibSession */ = { isa = PBXGroup; children = ( FD7F74692BAB8A6D006DDFD8 /* LibSession+Networking.swift */, ); - path = SessionUtil; + path = LibSession; sourceTree = ""; }; FD83B9B027CF200A005E1583 /* SessionUtilitiesKitTests */ = { @@ -4269,24 +4266,24 @@ path = Types; sourceTree = ""; }; - FD8ECF7529340F4800C0D1BB /* SessionUtil */ = { + FD8ECF7529340F4800C0D1BB /* LibSession */ = { isa = PBXGroup; children = ( FD2B4B022949886900AB4848 /* Database */, FD8ECF8E29381FB200C0D1BB /* Config Handling */, FD8ECF7A29340FFD00C0D1BB /* LibSession+SessionMessagingKit.swift */, ); - path = SessionUtil; + path = LibSession; sourceTree = ""; }; - FD8ECF802934385900C0D1BB /* LibSessionUtil */ = { + FD8ECF802934385900C0D1BB /* LibSession */ = { isa = PBXGroup; children = ( FDDC08F029A300D500BF9681 /* Utilities */, FDA1E83829A5771A00C5C3BD /* LibSessionUtilSpec.swift */, FDA1E83C29AC71A800C5C3BD /* LibSessionSpec.swift */, ); - path = LibSessionUtil; + path = LibSession; sourceTree = ""; }; FD8ECF8E29381FB200C0D1BB /* Config Handling */ = { @@ -4458,7 +4455,7 @@ FD3C906B27E43C2400CD579F /* Sending & Receiving */, FD7692F52A53A2C7000E4B70 /* Shared Models */, FD3C906827E417B100CD579F /* Utilities */, - FD8ECF802934385900C0D1BB /* LibSessionUtil */, + FD8ECF802934385900C0D1BB /* LibSession */, ); path = SessionMessagingKitTests; sourceTree = ""; @@ -4998,7 +4995,7 @@ DefaultBuildSystemTypeForWorkspace = Original; LastSwiftUpdateCheck = 1520; LastTestingUpgradeCheck = 0600; - LastUpgradeCheck = 1400; + LastUpgradeCheck = 1520; ORGANIZATIONNAME = "Rangeproof Pty Ltd"; TargetAttributes = { 453518671FC635DD00210559 = { @@ -6092,7 +6089,6 @@ FD7728982849E8110018502F /* UITableView+ReusableView.swift in Sources */, FD428B1B2B4B6098006D0888 /* Notifications+Lifecycle.swift in Sources */, 7B0EFDEE274F598600FFAAE7 /* TimestampUtils.swift in Sources */, - FDAED05C2A7C6CE600091B25 /* MigrationRequirement.swift in Sources */, FD52090028AF6153006098F6 /* OWSBackgroundTask.m in Sources */, C32C5DDB256DD9FF003C73A2 /* ContentProxy.swift in Sources */, C3A71F892558BA9F0043A11F /* Mnemonic.swift in Sources */, @@ -6238,7 +6234,6 @@ B8DE1FB426C22F2F0079C9CE /* WebRTCSession.swift in Sources */, FDC6D6F32860607300B04575 /* SessionEnvironment.swift in Sources */, FDC13D5A2A1721C5007267C7 /* LegacyNotifyRequest.swift in Sources */, - FDC6D6F32860607300B04575 /* SessionEnvironment.swift in Sources */, C3A3A171256E1D25004D228D /* SSKReachabilityManager.swift in Sources */, FD245C59285065FC00B966DD /* ControlMessage.swift in Sources */, FD6E4C8A2A1AEE4700C7C243 /* LegacyUnsubscribeRequest.swift in Sources */, @@ -7198,6 +7193,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -7211,6 +7207,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionUIKit"; @@ -7271,6 +7269,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7289,6 +7288,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionUIKit"; @@ -7335,6 +7336,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -7355,6 +7357,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SignalUtilitiesKit"; @@ -7415,6 +7419,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7440,6 +7445,8 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SignalUtilitiesKit"; @@ -7486,6 +7493,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -7518,6 +7526,8 @@ /usr/lib/swift, "\"$(TARGET_BUILD_DIR)/libSessionUtil\"", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionSnodeKit"; @@ -7579,6 +7589,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7616,6 +7627,8 @@ /usr/lib/swift, "\"$(TARGET_BUILD_DIR)/libSessionUtil\"", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionSnodeKit"; @@ -7663,6 +7676,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -7700,6 +7714,8 @@ /usr/lib/swift, "\"$(TARGET_BUILD_DIR)/libSessionUtil\"", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "$(inherited)"; @@ -7762,6 +7778,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7804,6 +7821,8 @@ /usr/lib/swift, "\"$(TARGET_BUILD_DIR)/libSessionUtil\"", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "$(inherited)"; @@ -7852,6 +7871,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -7890,6 +7910,8 @@ /usr/lib/swift, "\"$(TARGET_BUILD_DIR)/libSessionUtil\"", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionMessagingKit"; @@ -7951,6 +7973,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; + ENABLE_MODULE_VERIFIER = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -7994,6 +8017,8 @@ /usr/lib/swift, "\"$(TARGET_BUILD_DIR)/libSessionUtil\"", ); + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++14"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.loki-project.SessionMessagingKit"; @@ -8426,6 +8451,7 @@ CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_STYLE = Automatic; COPY_PHASE_STRIP = NO; @@ -8480,7 +8506,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = "$(inherited)"; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -8644,6 +8670,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; DEFINES_MODULE = YES; + ENABLE_MODULE_VERIFIER = YES; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -8651,6 +8678,8 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap"; + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "-ObjC"; @@ -8699,6 +8728,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEFINES_MODULE = YES; + ENABLE_MODULE_VERIFIER = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu11; @@ -8711,6 +8741,8 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 13.0; MODULEMAP_FILE = "$(SRCROOT)/SessionMessagingKit/Meta/SessionUtil.modulemap"; + MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++"; + MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; OTHER_LDFLAGS = "-ObjC"; diff --git a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme index 22887c56e..5665eb96b 100644 --- a/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme +++ b/Session.xcodeproj/xcshareddata/xcschemes/Session.xcscheme @@ -1,6 +1,6 @@ String? { guard section > 0 || !hasRecentEmoji else { - return NSLocalizedString("EMOJI_CATEGORY_RECENTS_NAME", - comment: "The name for the emoji category 'Recents'") + return "EMOJI_CATEGORY_RECENTS_NAME".localized() } guard let category = Emoji.Category.allCases[safe: section - categoryIndexOffset] else { @@ -298,7 +297,7 @@ extension EmojiPickerCollectionView: UICollectionViewDelegateFlowLayout { } private class EmojiCell: UICollectionViewCell { - static let reuseIdentifier = "EmojiCell" + static let reuseIdentifier = "EmojiCell" // stringlint:disable let emojiLabel = UILabel() @@ -328,7 +327,7 @@ private class EmojiCell: UICollectionViewCell { } private class EmojiSectionHeader: UICollectionReusableView { - static let reuseIdentifier = "EmojiSectionHeader" + static let reuseIdentifier = "EmojiSectionHeader" // stringlint:disable let label = UILabel() diff --git a/Session/Conversations/Message Cells/Content Views/DisappearingMessageTimerView.swift b/Session/Conversations/Message Cells/Content Views/DisappearingMessageTimerView.swift index 60a583317..fda44bf9e 100644 --- a/Session/Conversations/Message Cells/Content Views/DisappearingMessageTimerView.swift +++ b/Session/Conversations/Message Cells/Content Views/DisappearingMessageTimerView.swift @@ -54,7 +54,7 @@ class DisappearingMessageTimerView: UIView { } private func updateIcon() { - let imageName: String = "disappearing_message_\(String(format: "%02d", 5 * self.progress))" + let imageName: String = "disappearing_message_\(String(format: "%02d", 5 * self.progress))" // stringlint:disable self.iconImageView.image = UIImage(named: imageName)?.withRenderingMode(.alwaysTemplate) } diff --git a/Session/Emoji/Emoji+Available.swift b/Session/Emoji/Emoji+Available.swift index bfe58a53d..f0a007ebb 100644 --- a/Session/Emoji/Emoji+Available.swift +++ b/Session/Emoji/Emoji+Available.swift @@ -1,3 +1,7 @@ +// Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable + import Foundation import SignalCoreKit import SessionUtilitiesKit diff --git a/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift b/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift index 705c634fb..e62caa770 100644 --- a/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift +++ b/Session/Media Viewing & Editing/GIFs/GifPickerViewController.swift @@ -37,7 +37,7 @@ class GifPickerViewController: OWSViewController, UISearchBarDelegate, UICollect var hasSelectedCell: Bool = false var imageInfos = [GiphyImageInfo]() - private let kCellReuseIdentifier = "kCellReuseIdentifier" + private let kCellReuseIdentifier = "kCellReuseIdentifier" // stringlint:disable var progressiveSearchTimer: Timer? diff --git a/Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift b/Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift index 3afd8d56a..d215aab9b 100644 --- a/Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift +++ b/Session/Media Viewing & Editing/GIFs/GiphyDownloader.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import SignalUtilitiesKit diff --git a/Session/Utilities/IP2Country.swift b/Session/Utilities/IP2Country.swift index 326afc83e..9c84443e2 100644 --- a/Session/Utilities/IP2Country.swift +++ b/Session/Utilities/IP2Country.swift @@ -1,3 +1,7 @@ +// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable + import Foundation import GRDB import SessionSnodeKit diff --git a/SessionMessagingKit/Database/Models/Capability.swift b/SessionMessagingKit/Database/Models/Capability.swift index 304bc8813..2e3179df1 100644 --- a/SessionMessagingKit/Database/Models/Capability.swift +++ b/SessionMessagingKit/Database/Models/Capability.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import GRDB diff --git a/SessionMessagingKit/File Server/FileServerAPI.swift b/SessionMessagingKit/File Server/FileServerAPI.swift index cb80aa242..356f44dbe 100644 --- a/SessionMessagingKit/File Server/FileServerAPI.swift +++ b/SessionMessagingKit/File Server/FileServerAPI.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import Combine diff --git a/SessionMessagingKit/Jobs/Types/GarbageCollectionJob.swift b/SessionMessagingKit/Jobs/Types/GarbageCollectionJob.swift index bb4956a16..25b08aa2d 100644 --- a/SessionMessagingKit/Jobs/Types/GarbageCollectionJob.swift +++ b/SessionMessagingKit/Jobs/Types/GarbageCollectionJob.swift @@ -407,8 +407,8 @@ public enum GarbageCollectionJob: JobExecutor { // directory which contains content to keep as well as delete (directories which end up empty after // this clean up will be removed during the next run) let directoryNamesContainingContent: [String] = allAttachmentFilePaths - .filter { path -> Bool in path.contains("/") } - .compactMap { path -> String? in path.components(separatedBy: "/").first } + .filter { path -> Bool in path.contains("/") } // stringlint:disable + .compactMap { path -> String? in path.components(separatedBy: "/").first } // stringlint:disable let orphanedAttachmentFiles: Set = allAttachmentFilePaths .subtracting(fileInfo.attachmentLocalRelativePaths) .subtracting(directoryNamesContainingContent) diff --git a/SessionMessagingKit/SessionUtil/Config Handling/LibSession+Contacts.swift b/SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift similarity index 100% rename from SessionMessagingKit/SessionUtil/Config Handling/LibSession+Contacts.swift rename to SessionMessagingKit/LibSession/Config Handling/LibSession+Contacts.swift diff --git a/SessionMessagingKit/SessionUtil/Config Handling/LibSession+ConvoInfoVolatile.swift b/SessionMessagingKit/LibSession/Config Handling/LibSession+ConvoInfoVolatile.swift similarity index 100% rename from SessionMessagingKit/SessionUtil/Config Handling/LibSession+ConvoInfoVolatile.swift rename to SessionMessagingKit/LibSession/Config Handling/LibSession+ConvoInfoVolatile.swift diff --git a/SessionMessagingKit/SessionUtil/Config Handling/LibSession+Shared.swift b/SessionMessagingKit/LibSession/Config Handling/LibSession+Shared.swift similarity index 100% rename from SessionMessagingKit/SessionUtil/Config Handling/LibSession+Shared.swift rename to SessionMessagingKit/LibSession/Config Handling/LibSession+Shared.swift diff --git a/SessionMessagingKit/SessionUtil/Config Handling/LibSession+UserGroups.swift b/SessionMessagingKit/LibSession/Config Handling/LibSession+UserGroups.swift similarity index 100% rename from SessionMessagingKit/SessionUtil/Config Handling/LibSession+UserGroups.swift rename to SessionMessagingKit/LibSession/Config Handling/LibSession+UserGroups.swift diff --git a/SessionMessagingKit/SessionUtil/Config Handling/LibSession+UserProfile.swift b/SessionMessagingKit/LibSession/Config Handling/LibSession+UserProfile.swift similarity index 100% rename from SessionMessagingKit/SessionUtil/Config Handling/LibSession+UserProfile.swift rename to SessionMessagingKit/LibSession/Config Handling/LibSession+UserProfile.swift diff --git a/SessionMessagingKit/SessionUtil/Database/QueryInterfaceRequest+Utilities.swift b/SessionMessagingKit/LibSession/Database/QueryInterfaceRequest+Utilities.swift similarity index 100% rename from SessionMessagingKit/SessionUtil/Database/QueryInterfaceRequest+Utilities.swift rename to SessionMessagingKit/LibSession/Database/QueryInterfaceRequest+Utilities.swift diff --git a/SessionMessagingKit/SessionUtil/Database/Setting+Utilities.swift b/SessionMessagingKit/LibSession/Database/Setting+Utilities.swift similarity index 100% rename from SessionMessagingKit/SessionUtil/Database/Setting+Utilities.swift rename to SessionMessagingKit/LibSession/Database/Setting+Utilities.swift diff --git a/SessionMessagingKit/SessionUtil/LibSession+SessionMessagingKit.swift b/SessionMessagingKit/LibSession/LibSession+SessionMessagingKit.swift similarity index 97% rename from SessionMessagingKit/SessionUtil/LibSession+SessionMessagingKit.swift rename to SessionMessagingKit/LibSession/LibSession+SessionMessagingKit.swift index 92dc98b39..65f26ebd9 100644 --- a/SessionMessagingKit/SessionUtil/LibSession+SessionMessagingKit.swift +++ b/SessionMessagingKit/LibSession/LibSession+SessionMessagingKit.swift @@ -9,12 +9,12 @@ import SessionUtilitiesKit // MARK: - LibSession public extension LibSession { - public struct ConfResult { + struct ConfResult { let needsPush: Bool let needsDump: Bool } - public struct IncomingConfResult { + struct IncomingConfResult { let needsPush: Bool let needsDump: Bool let messageHashes: [String] @@ -23,7 +23,7 @@ public extension LibSession { var result: ConfResult { ConfResult(needsPush: needsPush, needsDump: needsDump) } } - public struct OutgoingConfResult { + struct OutgoingConfResult { let message: SharedConfigMessage let namespace: SnodeAPI.Namespace let obsoleteHashes: [String] @@ -33,7 +33,7 @@ public extension LibSession { fileprivate static var configStore: Atomic<[ConfigKey: Atomic?>]> = Atomic([:]) - public static func config(for variant: ConfigDump.Variant, publicKey: String) -> Atomic?> { + static func config(for variant: ConfigDump.Variant, publicKey: String) -> Atomic?> { let key: ConfigKey = ConfigKey(variant: variant, publicKey: publicKey) return ( @@ -50,7 +50,7 @@ public extension LibSession { /// Returns `true` if there is a config which needs to be pushed, but returns `false` if the configs are all up to date or haven't been /// loaded yet (eg. fresh install) - public static var needsSync: Bool { + static var needsSync: Bool { configStore .wrappedValue .contains { _, atomicConf in @@ -60,7 +60,7 @@ public extension LibSession { } } - public static var libSessionVersion: String { String(cString: LIBSESSION_UTIL_VERSION_STR) } + static var libSessionVersion: String { String(cString: LIBSESSION_UTIL_VERSION_STR) } internal static func lastError(_ conf: UnsafeMutablePointer?) -> String { return (conf?.pointee.last_error.map { String(cString: $0) } ?? "Unknown") // stringlint:disable @@ -68,13 +68,13 @@ public extension LibSession { // MARK: - Loading - public static func clearMemoryState() { + static func clearMemoryState() { LibSession.configStore.mutate { confStore in confStore.removeAll() } } - public static func loadState( + static func loadState( _ db: Database? = nil, userPublicKey: String, ed25519SecretKey: [UInt8]? @@ -204,7 +204,7 @@ public extension LibSession { // MARK: - Pushes - public static func pendingChanges( + static func pendingChanges( _ db: Database, publicKey: String ) throws -> [OutgoingConfResult] { @@ -285,7 +285,7 @@ public extension LibSession { } } - public static func markingAsPushed( + static func markingAsPushed( message: SharedConfigMessage, serverHash: String, publicKey: String @@ -311,7 +311,7 @@ public extension LibSession { } } - public static func configHashes(for publicKey: String) -> [String] { + static func configHashes(for publicKey: String) -> [String] { return Storage.shared .read { db -> Set in guard Identity.userExists(db) else { return [] } @@ -346,7 +346,7 @@ public extension LibSession { // MARK: - Receiving - public static func handleConfigMessages( + static func handleConfigMessages( _ db: Database, messages: [SharedConfigMessage], publicKey: String diff --git a/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift b/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift index 331ce7fa9..9d99023be 100644 --- a/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift +++ b/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import GRDB diff --git a/SessionMessagingKit/Sending & Receiving/Notifications/Models/UnsubscribeRequest.swift b/SessionMessagingKit/Sending & Receiving/Notifications/Models/UnsubscribeRequest.swift index 3d76f76ab..2567b3ac2 100644 --- a/SessionMessagingKit/Sending & Receiving/Notifications/Models/UnsubscribeRequest.swift +++ b/SessionMessagingKit/Sending & Receiving/Notifications/Models/UnsubscribeRequest.swift @@ -1,4 +1,6 @@ // Copyright © 2023 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import SessionSnodeKit diff --git a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift index 4875b31c7..f4b333a3e 100644 --- a/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift +++ b/SessionMessagingKit/Sending & Receiving/Pollers/ClosedGroupPoller.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import Combine diff --git a/SessionMessagingKit/Utilities/DeviceSleepManager.swift b/SessionMessagingKit/Utilities/DeviceSleepManager.swift index 85b95c42b..27cf51f9d 100644 --- a/SessionMessagingKit/Utilities/DeviceSleepManager.swift +++ b/SessionMessagingKit/Utilities/DeviceSleepManager.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import SessionUtilitiesKit diff --git a/SessionMessagingKitTests/LibSessionUtil/LibSessionSpec.swift b/SessionMessagingKitTests/LibSession/LibSessionSpec.swift similarity index 100% rename from SessionMessagingKitTests/LibSessionUtil/LibSessionSpec.swift rename to SessionMessagingKitTests/LibSession/LibSessionSpec.swift diff --git a/SessionMessagingKitTests/LibSessionUtil/LibSessionUtilSpec.swift b/SessionMessagingKitTests/LibSession/LibSessionUtilSpec.swift similarity index 100% rename from SessionMessagingKitTests/LibSessionUtil/LibSessionUtilSpec.swift rename to SessionMessagingKitTests/LibSession/LibSessionUtilSpec.swift diff --git a/SessionMessagingKitTests/LibSessionUtil/Utilities/LibSessionTypeConversionUtilitiesSpec.swift b/SessionMessagingKitTests/LibSession/Utilities/LibSessionTypeConversionUtilitiesSpec.swift similarity index 100% rename from SessionMessagingKitTests/LibSessionUtil/Utilities/LibSessionTypeConversionUtilitiesSpec.swift rename to SessionMessagingKitTests/LibSession/Utilities/LibSessionTypeConversionUtilitiesSpec.swift diff --git a/SessionSnodeKit/Database/Migrations/_001_InitialSetupMigration.swift b/SessionSnodeKit/Database/Migrations/_001_InitialSetupMigration.swift index cc5464c4f..f902571ef 100644 --- a/SessionSnodeKit/Database/Migrations/_001_InitialSetupMigration.swift +++ b/SessionSnodeKit/Database/Migrations/_001_InitialSetupMigration.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import GRDB diff --git a/SessionSnodeKit/SessionUtil/LibSession+Networking.swift b/SessionSnodeKit/LibSession/LibSession+Networking.swift similarity index 100% rename from SessionSnodeKit/SessionUtil/LibSession+Networking.swift rename to SessionSnodeKit/LibSession/LibSession+Networking.swift diff --git a/SessionSnodeKit/Models/DeleteAllBeforeRequest.swift b/SessionSnodeKit/Models/DeleteAllBeforeRequest.swift index a4a83d994..02ff344ec 100644 --- a/SessionSnodeKit/Models/DeleteAllBeforeRequest.swift +++ b/SessionSnodeKit/Models/DeleteAllBeforeRequest.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation diff --git a/SessionSnodeKit/Models/UpdateExpiryAllRequest.swift b/SessionSnodeKit/Models/UpdateExpiryAllRequest.swift index e8d2238bb..23b6a54fd 100644 --- a/SessionSnodeKit/Models/UpdateExpiryAllRequest.swift +++ b/SessionSnodeKit/Models/UpdateExpiryAllRequest.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation diff --git a/SessionSnodeKit/Models/UpdateExpiryRequest.swift b/SessionSnodeKit/Models/UpdateExpiryRequest.swift index 073a585c5..18524e1e2 100644 --- a/SessionSnodeKit/Models/UpdateExpiryRequest.swift +++ b/SessionSnodeKit/Models/UpdateExpiryRequest.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation diff --git a/SessionUIKit/Style Guide/Fonts.swift b/SessionUIKit/Style Guide/Fonts.swift index bf70275d1..746658464 100644 --- a/SessionUIKit/Style Guide/Fonts.swift +++ b/SessionUIKit/Style Guide/Fonts.swift @@ -1,3 +1,7 @@ +// Copyright © 2024 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable + import UIKit import SwiftUI diff --git a/SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift b/SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift index 5cdbdd363..91f22a9f3 100644 --- a/SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift +++ b/SessionUtilitiesKit/Database/Utilities/Database+Utilities.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation import GRDB diff --git a/SessionUtilitiesKit/General/AppContext.swift b/SessionUtilitiesKit/General/AppContext.swift index e9d15e15c..b18d0666d 100644 --- a/SessionUtilitiesKit/General/AppContext.swift +++ b/SessionUtilitiesKit/General/AppContext.swift @@ -57,7 +57,7 @@ public extension AppContext { var temporaryDirectory: String { if let dir: String = _temporaryDirectory { return dir } - let dirName: String = "ows_temp_\(UUID().uuidString)" + let dirName: String = "ows_temp_\(UUID().uuidString)" // stringlint:disable let dirPath: String = URL(fileURLWithPath: NSTemporaryDirectory()) .appendingPathComponent(dirName) .path diff --git a/SessionUtilitiesKit/General/Array+Utilities.swift b/SessionUtilitiesKit/General/Array+Utilities.swift index 04e63f92c..1474005b1 100644 --- a/SessionUtilitiesKit/General/Array+Utilities.swift +++ b/SessionUtilitiesKit/General/Array+Utilities.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation diff --git a/SessionUtilitiesKit/General/Data+Utilities.swift b/SessionUtilitiesKit/General/Data+Utilities.swift index cc4d17aeb..6039ba815 100644 --- a/SessionUtilitiesKit/General/Data+Utilities.swift +++ b/SessionUtilitiesKit/General/Data+Utilities.swift @@ -1,4 +1,6 @@ // Copyright © 2022 Rangeproof Pty Ltd. All rights reserved. +// +// stringlint:disable import Foundation diff --git a/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift b/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift index dcd4f2044..2e67bb7db 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentCaptionToolbar.swift @@ -175,7 +175,7 @@ class AttachmentCaptionToolbar: UIView, UITextViewDelegate { // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button // allows the user to get the keyboard out of the way while in the attachment approval view. - if text == "\n" { + if text == "\n" { // stringlint:disable attachmentCaptionToolbarDelegate?.attachmentCaptionToolbarDidComplete() return false } diff --git a/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift b/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift index 736c9049b..c6b4acfe9 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/Attachment Approval/AttachmentTextToolbar.swift @@ -252,7 +252,7 @@ class AttachmentTextToolbar: UIView, UITextViewDelegate { // Though we can wrap the text, we don't want to encourage multline captions, plus a "done" button // allows the user to get the keyboard out of the way while in the attachment approval view. - if text == "\n" { + if text == "\n" { // stringlint:disable textView.resignFirstResponder() return false } diff --git a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTextViewController.swift b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTextViewController.swift index 2e9e5b998..c895cd795 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTextViewController.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTextViewController.swift @@ -42,7 +42,7 @@ private class VAlignTextView: UITextView { super.init(frame: .zero, textContainer: nil) - self.addObserver(self, forKeyPath: "contentSize", options: .new, context: nil) + self.addObserver(self, forKeyPath: "contentSize", options: .new, context: nil) // stringlint:disable } @available(*, unavailable, message: "use other init() instead.") @@ -51,7 +51,7 @@ private class VAlignTextView: UITextView { } deinit { - self.removeObserver(self, forKeyPath: "contentSize") + self.removeObserver(self, forKeyPath: "contentSize") // stringlint:disable } private func updateInsets() { diff --git a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTransform.swift b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTransform.swift index 4854af6d7..64dc109bb 100644 --- a/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTransform.swift +++ b/SignalUtilitiesKit/Media Viewing & Editing/Image Editing/ImageEditorTransform.swift @@ -235,6 +235,6 @@ public class ImageEditorTransform: NSObject { } open override var description: String { - return "[outputSizePixels: \(outputSizePixels), unitTranslation: \(unitTranslation), rotationRadians: \(rotationRadians), scaling: \(scaling), isFlipped: \(isFlipped)]" + return "[outputSizePixels: \(outputSizePixels), unitTranslation: \(unitTranslation), rotationRadians: \(rotationRadians), scaling: \(scaling), isFlipped: \(isFlipped)]" // stringlint:disable } } diff --git a/SignalUtilitiesKit/Utilities/Bench.swift b/SignalUtilitiesKit/Utilities/Bench.swift index cfcf5d7ad..e20e76328 100644 --- a/SignalUtilitiesKit/Utilities/Bench.swift +++ b/SignalUtilitiesKit/Utilities/Bench.swift @@ -1,4 +1,6 @@ // Copyright (c) 2019 Open Whisper Systems. All rights reserved. +// +// stringlint:disable import Foundation import SignalCoreKit