From 9ad7a86e6fae2c64b40c4b128c50494e5d826455 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sat, 6 Nov 2021 16:34:05 +0800 Subject: [PATCH 1/9] Update to Xcode 13.1 --- SSignalKit.xcodeproj/project.pbxproj | 191 ++++++++++++------ SSignalKit/SBlockDisposable.h | 2 +- SSignalKit/SBlockDisposable.m | 2 +- SSignalKit/SMulticastSignalManager.h | 4 +- SSignalKit/SMulticastSignalManager.m | 20 +- SSignalKit/SSignal+Catch.m | 4 +- SSignalKit/SSignal+Dispatch.m | 8 +- SSignalKit/SSignal+Meta.h | 2 +- SSignalKit/SSignal+Meta.m | 12 +- SSignalKit/SSignal+Pipe.h | 2 +- SSignalKit/SSignal+SideEffects.h | 8 +- SSignalKit/SSignal+SideEffects.m | 8 +- SSignalKit/SSignal.h | 4 +- SSignalKit/SSignal.m | 6 +- SSignalKit/SSubscriber.h | 6 +- SSignalKit/SSubscriber.m | 8 +- SSignalKit/SThreadPool.h | 2 +- SSignalKit/SThreadPool.m | 20 +- SSignalKit/SThreadPoolQueue.m | 2 +- SSignalKit/SThreadPoolTask.h | 2 +- SSignalKit/SThreadPoolTask.m | 4 +- SSignalKit/STimer.m | 6 +- SSignalKit/SVariable.m | 4 +- SSignalKitTests/SSignalBasicTests.m | 4 +- SwiftSignalKit/Disposable.swift | 4 +- SwiftSignalKit/Signal_Dispatch.swift | 8 +- SwiftSignalKit/ThreadPool.swift | 6 +- SwiftSignalKit/Timer.swift | 4 +- .../SwiftSignalKitFunctionsTests.swift | 2 +- 29 files changed, 208 insertions(+), 147 deletions(-) diff --git a/SSignalKit.xcodeproj/project.pbxproj b/SSignalKit.xcodeproj/project.pbxproj index 4218275..671abd7 100644 --- a/SSignalKit.xcodeproj/project.pbxproj +++ b/SSignalKit.xcodeproj/project.pbxproj @@ -635,7 +635,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 1310; ORGANIZATIONNAME = Telegram; TargetAttributes = { D0085B211B282B9800EAF753 = { @@ -663,6 +663,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, ); mainGroup = D0445DCE1A7C2CA500267924; @@ -875,7 +876,6 @@ ); INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -885,7 +885,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = DebugHockeyapp; }; @@ -906,7 +905,6 @@ GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -916,7 +914,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = ReleaseHockeyapp; }; @@ -934,11 +931,9 @@ "$(inherited)", ); INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = DebugHockeyapp; }; @@ -953,12 +948,10 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; }; name = ReleaseHockeyapp; }; @@ -966,17 +959,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1000,10 +1005,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1023,7 +1030,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = NO; @@ -1078,7 +1084,6 @@ ); INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1088,7 +1093,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = DebugFork; }; @@ -1106,11 +1110,9 @@ "$(inherited)", ); INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = DebugFork; }; @@ -1134,14 +1136,12 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; }; name = DebugFork; }; @@ -1149,17 +1149,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1183,10 +1195,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1197,17 +1211,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1224,9 +1250,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1247,7 +1276,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = NO; @@ -1271,7 +1299,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1329,17 +1356,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1356,9 +1395,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1379,7 +1421,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1426,7 +1467,6 @@ GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1436,7 +1476,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = ReleaseAppStore; }; @@ -1451,11 +1490,9 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = ReleaseAppStore; }; @@ -1463,17 +1500,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1490,9 +1539,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1513,7 +1565,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1560,7 +1611,6 @@ GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1570,7 +1620,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = ReleaseHockeyappInternal; }; @@ -1585,12 +1634,10 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; }; name = ReleaseHockeyappInternal; }; @@ -1615,13 +1662,11 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; }; name = ReleaseHockeyappInternal; }; @@ -1629,17 +1674,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1663,10 +1720,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1686,7 +1745,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = NO; @@ -1741,7 +1799,6 @@ ); INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -1751,7 +1808,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = DebugAppStoreLLC; }; @@ -1769,11 +1825,9 @@ "$(inherited)", ); INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = DebugAppStoreLLC; }; @@ -1797,14 +1851,12 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; }; name = DebugAppStoreLLC; }; @@ -1828,14 +1880,12 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; }; name = DebugHockeyapp; }; @@ -1860,13 +1910,11 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; }; name = ReleaseHockeyapp; }; @@ -1891,13 +1939,11 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; }; name = ReleaseAppStore; }; @@ -1905,17 +1951,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -1932,9 +1990,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1955,7 +2016,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2002,7 +2062,6 @@ GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2012,7 +2071,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = ReleaseAppStoreLLC; }; @@ -2027,11 +2085,9 @@ ); GCC_NO_COMMON_BLOCKS = YES; INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = ReleaseAppStoreLLC; }; @@ -2056,13 +2112,11 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; }; name = ReleaseAppStoreLLC; }; @@ -2070,17 +2124,29 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + 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_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; @@ -2104,10 +2170,12 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.1; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; + MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2127,7 +2195,6 @@ ENABLE_BITCODE = YES; INFOPLIST_FILE = SSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; ONLY_ACTIVE_ARCH = NO; @@ -2182,7 +2249,6 @@ ); INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; @@ -2192,7 +2258,6 @@ SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; - SWIFT_VERSION = 4.0; }; name = DebugAppStore; }; @@ -2210,11 +2275,9 @@ "$(inherited)", ); INFOPLIST_FILE = SwiftSignalKitTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.3; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; }; name = DebugAppStore; }; @@ -2238,14 +2301,12 @@ INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.10; PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; }; name = DebugAppStore; }; diff --git a/SSignalKit/SBlockDisposable.h b/SSignalKit/SBlockDisposable.h index 2914604..9b82339 100644 --- a/SSignalKit/SBlockDisposable.h +++ b/SSignalKit/SBlockDisposable.h @@ -2,6 +2,6 @@ @interface SBlockDisposable : NSObject -- (instancetype)initWithBlock:(void (^)())block; +- (instancetype)initWithBlock:(void (^)(void))block; @end diff --git a/SSignalKit/SBlockDisposable.m b/SSignalKit/SBlockDisposable.m index b8d1f98..89dabef 100644 --- a/SSignalKit/SBlockDisposable.m +++ b/SSignalKit/SBlockDisposable.m @@ -12,7 +12,7 @@ @interface SBlockDisposable () @implementation SBlockDisposable -- (instancetype)initWithBlock:(void (^)())block +- (instancetype)initWithBlock:(void (^)(void))block { self = [super init]; if (self != nil) diff --git a/SSignalKit/SMulticastSignalManager.h b/SSignalKit/SMulticastSignalManager.h index 243f015..cebd7e7 100644 --- a/SSignalKit/SMulticastSignalManager.h +++ b/SSignalKit/SMulticastSignalManager.h @@ -2,8 +2,8 @@ @interface SMulticastSignalManager : NSObject -- (SSignal *)multicastedSignalForKey:(NSString *)key producer:(SSignal *(^)())producer; -- (void)startStandaloneSignalIfNotRunningForKey:(NSString *)key producer:(SSignal *(^)())producer; +- (SSignal *)multicastedSignalForKey:(NSString *)key producer:(SSignal *(^)(void))producer; +- (void)startStandaloneSignalIfNotRunningForKey:(NSString *)key producer:(SSignal *(^)(void))producer; - (SSignal *)multicastedPipeForKey:(NSString *)key; - (void)putNext:(id)next toMulticastedPipeForKey:(NSString *)key; diff --git a/SSignalKit/SMulticastSignalManager.m b/SSignalKit/SMulticastSignalManager.m index 1094852..bdaa38e 100644 --- a/SSignalKit/SMulticastSignalManager.m +++ b/SSignalKit/SMulticastSignalManager.m @@ -45,7 +45,7 @@ - (void)dealloc } } -- (SSignal *)multicastedSignalForKey:(NSString *)key producer:(SSignal *(^)())producer +- (SSignal *)multicastedSignalForKey:(NSString *)key producer:(SSignal *(^)(void))producer { if (key == nil) { @@ -83,7 +83,7 @@ - (SSignal *)multicastedSignalForKey:(NSString *)key producer:(SSignal *(^)())pr return signal; } -- (void)startStandaloneSignalIfNotRunningForKey:(NSString *)key producer:(SSignal *(^)())producer +- (void)startStandaloneSignalIfNotRunningForKey:(NSString *)key producer:(SSignal *(^)(void))producer { if (key == nil) return; @@ -130,28 +130,28 @@ - (SSignal *)multicastedPipeForKey:(NSString *)key { return [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - OSSpinLockLock(&_lock); - SBag *bag = _pipeListeners[key]; + OSSpinLockLock(&self->_lock); + SBag *bag = self->_pipeListeners[key]; if (bag == nil) { bag = [[SBag alloc] init]; - _pipeListeners[key] = bag; + self->_pipeListeners[key] = bag; } NSInteger index = [bag addItem:[^(id next) { [subscriber putNext:next]; } copy]]; - OSSpinLockUnlock(&_lock); + OSSpinLockUnlock(&self->_lock); return [[SBlockDisposable alloc] initWithBlock:^ { - OSSpinLockLock(&_lock); - SBag *bag = _pipeListeners[key]; + OSSpinLockLock(&self->_lock); + SBag *bag = self->_pipeListeners[key]; [bag removeItem:index]; if ([bag isEmpty]) { - [_pipeListeners removeObjectForKey:key]; + [self->_pipeListeners removeObjectForKey:key]; } - OSSpinLockUnlock(&_lock); + OSSpinLockUnlock(&self->_lock); }]; }]; } diff --git a/SSignalKit/SSignal+Catch.m b/SSignalKit/SSignal+Catch.m index f61e277..8726365 100644 --- a/SSignalKit/SSignal+Catch.m +++ b/SSignalKit/SSignal+Catch.m @@ -54,7 +54,7 @@ - (SSignal *)restart SMetaDisposable *currentDisposable = [[SMetaDisposable alloc] init]; - void (^start)() = recursiveBlock(^(dispatch_block_t recurse) + void (^start)(void) = recursiveBlock(^(dispatch_block_t recurse) { NSNumber *currentShouldRestart = [shouldRestart with:^id(NSNumber *current) { @@ -98,7 +98,7 @@ - (SSignal *)retryIf:(bool (^)(id error))predicate { SMetaDisposable *currentDisposable = [[SMetaDisposable alloc] init]; - void (^start)() = recursiveBlock(^(dispatch_block_t recurse) + void (^start)(void) = recursiveBlock(^(dispatch_block_t recurse) { NSNumber *currentShouldRestart = [shouldRestart with:^id(NSNumber *current) { diff --git a/SSignalKit/SSignal+Dispatch.m b/SSignalKit/SSignal+Dispatch.m index 3929f07..002773a 100644 --- a/SSignalKit/SSignal+Dispatch.m +++ b/SSignalKit/SSignal+Dispatch.m @@ -61,7 +61,7 @@ - (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool SThreadPoolQueue *queue = [threadPool nextQueue]; return [self startWithNext:^(id next) { - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)()) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) { if (!cancelled()) [subscriber putNext:next]; @@ -69,7 +69,7 @@ - (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool [queue addTask:task]; } error:^(id error) { - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)()) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) { if (!cancelled()) [subscriber putError:error]; @@ -77,7 +77,7 @@ - (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool [queue addTask:task]; } completed:^ { - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)()) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) { if (!cancelled()) [subscriber putCompletion]; @@ -125,7 +125,7 @@ - (SSignal *)startOnThreadPool:(SThreadPool *)threadPool { SMetaDisposable *disposable = [[SMetaDisposable alloc] init]; - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)()) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) { if (cancelled && cancelled()) return; diff --git a/SSignalKit/SSignal+Meta.h b/SSignalKit/SSignal+Meta.h index 2d90df1..a66af4f 100644 --- a/SSignalKit/SSignal+Meta.h +++ b/SSignalKit/SSignal+Meta.h @@ -11,7 +11,7 @@ - (SSignal *)then:(SSignal *)signal; - (SSignal *)queue; - (SSignal *)throttled; -+ (SSignal *)defer:(SSignal *(^)())generator; ++ (SSignal *)defer:(SSignal *(^)(void))generator; @end diff --git a/SSignalKit/SSignal+Meta.m b/SSignalKit/SSignal+Meta.m index f6ad412..7e0c496 100644 --- a/SSignalKit/SSignal+Meta.m +++ b/SSignalKit/SSignal+Meta.m @@ -68,10 +68,10 @@ - (void)enqueueSignal:(SSignal *)signal __weak SSignalQueueState *weakSelf = self; id disposable = [signal startWithNext:^(id next) { - [_subscriber putNext:next]; + [self->_subscriber putNext:next]; } error:^(id error) { - [_subscriber putError:error]; + [self->_subscriber putError:error]; } completed:^ { __strong SSignalQueueState *strongSelf = weakSelf; @@ -114,10 +114,10 @@ - (void)headCompleted __weak SSignalQueueState *weakSelf = self; id disposable = [nextSignal startWithNext:^(id next) { - [_subscriber putNext:next]; + [self->_subscriber putNext:next]; } error:^(id error) { - [_subscriber putError:error]; + [self->_subscriber putError:error]; } completed:^ { __strong SSignalQueueState *strongSelf = weakSelf; @@ -259,7 +259,7 @@ - (SSignal *)throttled { }]; } -+ (SSignal *)defer:(SSignal *(^)())generator ++ (SSignal *)defer:(SSignal *(^)(void))generator { return [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { @@ -314,7 +314,7 @@ - (SSignal *)enqueue:(SSignal *)signal { return [SSignal complete]; }]; - _pipe.sink([proxy takeUntilReplacement:disposePipe.signalProducer()]); + self->_pipe.sink([proxy takeUntilReplacement:disposePipe.signalProducer()]); return [[SBlockDisposable alloc] initWithBlock:^{ disposePipe.sink([SSignal complete]); diff --git a/SSignalKit/SSignal+Pipe.h b/SSignalKit/SSignal+Pipe.h index 2a21ee4..d8a5a08 100644 --- a/SSignalKit/SSignal+Pipe.h +++ b/SSignalKit/SSignal+Pipe.h @@ -2,7 +2,7 @@ @interface SPipe : NSObject -@property (nonatomic, copy, readonly) SSignal *(^signalProducer)(); +@property (nonatomic, copy, readonly) SSignal *(^signalProducer)(void); @property (nonatomic, copy, readonly) void (^sink)(id); - (instancetype)initWithReplay:(bool)replay; diff --git a/SSignalKit/SSignal+SideEffects.h b/SSignalKit/SSignal+SideEffects.h index 8107fcf..1e1be9e 100644 --- a/SSignalKit/SSignal+SideEffects.h +++ b/SSignalKit/SSignal+SideEffects.h @@ -2,12 +2,12 @@ @interface SSignal (SideEffects) -- (SSignal *)onStart:(void (^)())f; +- (SSignal *)onStart:(void (^)(void))f; - (SSignal *)onNext:(void (^)(id next))f; - (SSignal *)afterNext:(void (^)(id next))f; - (SSignal *)onError:(void (^)(id error))f; -- (SSignal *)onCompletion:(void (^)())f; -- (SSignal *)afterCompletion:(void (^)())f; -- (SSignal *)onDispose:(void (^)())f; +- (SSignal *)onCompletion:(void (^)(void))f; +- (SSignal *)afterCompletion:(void (^)(void))f; +- (SSignal *)onDispose:(void (^)(void))f; @end diff --git a/SSignalKit/SSignal+SideEffects.m b/SSignalKit/SSignal+SideEffects.m index 3d78102..4de6338 100644 --- a/SSignalKit/SSignal+SideEffects.m +++ b/SSignalKit/SSignal+SideEffects.m @@ -5,7 +5,7 @@ @implementation SSignal (SideEffects) -- (SSignal *)onStart:(void (^)())f +- (SSignal *)onStart:(void (^)(void))f { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { @@ -77,7 +77,7 @@ - (SSignal *)onError:(void (^)(id error))f }]; } -- (SSignal *)onCompletion:(void (^)())f +- (SSignal *)onCompletion:(void (^)(void))f { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { @@ -95,7 +95,7 @@ - (SSignal *)onCompletion:(void (^)())f }]; } -- (SSignal *)afterCompletion:(void (^)())f { +- (SSignal *)afterCompletion:(void (^)(void))f { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { return [self startWithNext:^(id next) @@ -112,7 +112,7 @@ - (SSignal *)afterCompletion:(void (^)())f { }]; } -- (SSignal *)onDispose:(void (^)())f +- (SSignal *)onDispose:(void (^)(void))f { return [[SSignal alloc] initWithGenerator:^(SSubscriber *subscriber) { diff --git a/SSignalKit/SSignal.h b/SSignalKit/SSignal.h index 46b7385..ef5c63a 100644 --- a/SSignalKit/SSignal.h +++ b/SSignalKit/SSignal.h @@ -8,9 +8,9 @@ - (instancetype)initWithGenerator:(id (^)(SSubscriber *))generator; -- (id)startWithNext:(void (^)(id next))next error:(void (^)(id error))error completed:(void (^)())completed; +- (id)startWithNext:(void (^)(id next))next error:(void (^)(id error))error completed:(void (^)(void))completed; - (id)startWithNext:(void (^)(id next))next; -- (id)startWithNext:(void (^)(id next))next completed:(void (^)())completed; +- (id)startWithNext:(void (^)(id next))next completed:(void (^)(void))completed; - (SSignal *)trace:(NSString *)name; diff --git a/SSignalKit/SSignal.m b/SSignalKit/SSignal.m index 6bf3ff4..aec750e 100644 --- a/SSignalKit/SSignal.m +++ b/SSignalKit/SSignal.m @@ -49,7 +49,7 @@ - (instancetype)initWithGenerator:(id (^)(SSubscriber *))generator return self; } -- (id)startWithNext:(void (^)(id next))next error:(void (^)(id error))error completed:(void (^)())completed traceName:(NSString *)traceName +- (id)startWithNext:(void (^)(id next))next error:(void (^)(id error))error completed:(void (^)(void))completed traceName:(NSString *)traceName { STracingSubscriber *subscriber = [[STracingSubscriber alloc] initWithName:traceName next:next error:error completed:completed]; id disposable = _generator(subscriber); @@ -57,7 +57,7 @@ - (instancetype)initWithGenerator:(id (^)(SSubscriber *))generator return [[SSubscriberDisposable alloc] initWithSubscriber:subscriber disposable:disposable]; } -- (id)startWithNext:(void (^)(id next))next error:(void (^)(id error))error completed:(void (^)())completed +- (id)startWithNext:(void (^)(id next))next error:(void (^)(id error))error completed:(void (^)(void))completed { SSubscriber *subscriber = [[SSubscriber alloc] initWithNext:next error:error completed:completed]; id disposable = _generator(subscriber); @@ -73,7 +73,7 @@ - (instancetype)initWithGenerator:(id (^)(SSubscriber *))generator return [[SSubscriberDisposable alloc] initWithSubscriber:subscriber disposable:disposable]; } -- (id)startWithNext:(void (^)(id next))next completed:(void (^)())completed +- (id)startWithNext:(void (^)(id next))next completed:(void (^)(void))completed { SSubscriber *subscriber = [[SSubscriber alloc] initWithNext:next error:nil completed:completed]; id disposable = _generator(subscriber); diff --git a/SSignalKit/SSubscriber.h b/SSignalKit/SSubscriber.h index ce4fee5..67aa8b8 100644 --- a/SSignalKit/SSubscriber.h +++ b/SSignalKit/SSubscriber.h @@ -4,7 +4,7 @@ { } -- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)())completed; +- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)(void))completed; - (void)_assignDisposable:(id)disposable; - (void)_markTerminatedWithoutDisposal; @@ -17,6 +17,6 @@ @interface STracingSubscriber : SSubscriber -- (instancetype)initWithName:(NSString *)name next:(void (^)(id))next error:(void (^)(id))error completed:(void (^)())completed; +- (instancetype)initWithName:(NSString *)name next:(void (^)(id))next error:(void (^)(id))error completed:(void (^)(void))completed; -@end \ No newline at end of file +@end diff --git a/SSignalKit/SSubscriber.m b/SSignalKit/SSubscriber.m index e565b77..bcd2d59 100644 --- a/SSignalKit/SSubscriber.m +++ b/SSignalKit/SSubscriber.m @@ -6,14 +6,14 @@ @interface SSubscriberBlocks : NSObject { @public void (^_next)(id); void (^_error)(id); - void (^_completed)(); + void (^_completed)(void); } @end @implementation SSubscriberBlocks -- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)())completed { +- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)(void))completed { self = [super init]; if (self != nil) { _next = [next copy]; @@ -38,7 +38,7 @@ @interface SSubscriber () @implementation SSubscriber -- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)())completed +- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)(void))completed { self = [super init]; if (self != nil) @@ -159,7 +159,7 @@ @interface STracingSubscriber () @implementation STracingSubscriber -- (instancetype)initWithName:(NSString *)name next:(void (^)(id))next error:(void (^)(id))error completed:(void (^)())completed +- (instancetype)initWithName:(NSString *)name next:(void (^)(id))next error:(void (^)(id))error completed:(void (^)(void))completed { self = [super initWithNext:next error:error completed:completed]; if (self != nil) diff --git a/SSignalKit/SThreadPool.h b/SSignalKit/SThreadPool.h index 69d0565..46c7b4f 100644 --- a/SSignalKit/SThreadPool.h +++ b/SSignalKit/SThreadPool.h @@ -10,6 +10,6 @@ - (void)addTask:(SThreadPoolTask *)task; - (SThreadPoolQueue *)nextQueue; -- (void)_workOnQueue:(SThreadPoolQueue *)queue block:(void (^)())block; +- (void)_workOnQueue:(SThreadPoolQueue *)queue block:(void (^)(void))block; @end diff --git a/SSignalKit/SThreadPool.m b/SSignalKit/SThreadPool.m index 060ee29..d6d8150 100644 --- a/SSignalKit/SThreadPool.m +++ b/SSignalKit/SThreadPool.m @@ -79,15 +79,15 @@ - (instancetype)initWithThreadCount:(NSUInteger)threadCount threadPriority:(doub [_managementQueue dispatch:^ { - _threads = [[NSMutableArray alloc] init]; - _queues = [[NSMutableArray alloc] init]; - _takenQueues = [[NSMutableArray alloc] init]; + self->_threads = [[NSMutableArray alloc] init]; + self->_queues = [[NSMutableArray alloc] init]; + self->_takenQueues = [[NSMutableArray alloc] init]; for (NSUInteger i = 0; i < threadCount; i++) { NSThread *thread = [[NSThread alloc] initWithTarget:[SThreadPool class] selector:@selector(threadEntryPoint:) object:self]; thread.name = [[NSString alloc] initWithFormat:@"SThreadPool-%p-%d", self, (int)i]; [thread setThreadPriority:threadPriority]; - [_threads addObject:thread]; + [self->_threads addObject:thread]; [thread start]; } }]; @@ -112,16 +112,16 @@ - (SThreadPoolQueue *)nextQueue return [[SThreadPoolQueue alloc] initWithThreadPool:self]; } -- (void)_workOnQueue:(SThreadPoolQueue *)queue block:(void (^)())block +- (void)_workOnQueue:(SThreadPoolQueue *)queue block:(void (^)(void))block { [_managementQueue dispatch:^ { - pthread_mutex_lock(&_mutex); + pthread_mutex_lock(&self->_mutex); block(); - if (![_queues containsObject:queue] && ![_takenQueues containsObject:queue]) - [_queues addObject:queue]; - pthread_cond_broadcast(&_cond); - pthread_mutex_unlock(&_mutex); + if (![self->_queues containsObject:queue] && ![self->_takenQueues containsObject:queue]) + [self->_queues addObject:queue]; + pthread_cond_broadcast(&self->_cond); + pthread_mutex_unlock(&self->_mutex); }]; } diff --git a/SSignalKit/SThreadPoolQueue.m b/SSignalKit/SThreadPoolQueue.m index ff857e6..bc12f24 100644 --- a/SSignalKit/SThreadPoolQueue.m +++ b/SSignalKit/SThreadPoolQueue.m @@ -28,7 +28,7 @@ - (void)addTask:(SThreadPoolTask *)task SThreadPool *threadPool = _threadPool; [threadPool _workOnQueue:self block:^ { - [_tasks addObject:task]; + [self->_tasks addObject:task]; }]; } diff --git a/SSignalKit/SThreadPoolTask.h b/SSignalKit/SThreadPoolTask.h index e8da985..cc1a542 100644 --- a/SSignalKit/SThreadPoolTask.h +++ b/SSignalKit/SThreadPoolTask.h @@ -2,7 +2,7 @@ @interface SThreadPoolTask : NSObject -- (instancetype)initWithBlock:(void (^)(bool (^)()))block; +- (instancetype)initWithBlock:(void (^)(bool (^)(void)))block; - (void)execute; - (void)cancel; diff --git a/SSignalKit/SThreadPoolTask.m b/SSignalKit/SThreadPoolTask.m index c967022..98fad6f 100644 --- a/SSignalKit/SThreadPoolTask.m +++ b/SSignalKit/SThreadPoolTask.m @@ -14,7 +14,7 @@ @implementation SThreadPoolTaskState @interface SThreadPoolTask () { - void (^_block)(bool (^)()); + void (^_block)(bool (^)(void)); SThreadPoolTaskState *_state; } @@ -22,7 +22,7 @@ @interface SThreadPoolTask () @implementation SThreadPoolTask -- (instancetype)initWithBlock:(void (^)(bool (^)()))block +- (instancetype)initWithBlock:(void (^)(bool (^)(void)))block { self = [super init]; if (self != nil) diff --git a/SSignalKit/STimer.m b/SSignalKit/STimer.m index 235c2f8..a382aef 100644 --- a/SSignalKit/STimer.m +++ b/SSignalKit/STimer.m @@ -53,9 +53,9 @@ - (void)start dispatch_source_set_event_handler(_timer, ^ { - if (_completion) - _completion(); - if (!_repeat) + if (self->_completion) + self->_completion(); + if (!self->_repeat) [self invalidate]; }); dispatch_resume(_timer); diff --git a/SSignalKit/SVariable.m b/SSignalKit/SVariable.m index 45eea46..dc02ce9 100644 --- a/SSignalKit/SVariable.m +++ b/SSignalKit/SVariable.m @@ -41,8 +41,8 @@ - (SSignal *)signal return [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { OSSpinLockLock(&self->_lock); - id currentValue = _value; - bool hasValue = _hasValue; + id currentValue = self->_value; + bool hasValue = self->_hasValue; NSInteger index = [self->_subscribers addItem:[^(id value) { [subscriber putNext:value]; diff --git a/SSignalKitTests/SSignalBasicTests.m b/SSignalKitTests/SSignalBasicTests.m index 56ca983..ac00a69 100644 --- a/SSignalKitTests/SSignalBasicTests.m +++ b/SSignalKitTests/SSignalBasicTests.m @@ -718,7 +718,7 @@ - (void)testRetryErrorNoMatch { } - (void)testRetryErrorMatch { - __block counter = 1; + __block NSInteger counter = 1; SSignal *s = [[[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { if (counter == 1) { counter++; @@ -740,7 +740,7 @@ - (void)testRetryErrorMatch { } - (void)testRetryErrorFailNoMatch { - __block counter = 1; + __block NSInteger counter = 1; SSignal *s = [[[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { if (counter == 1) { counter++; diff --git a/SwiftSignalKit/Disposable.swift b/SwiftSignalKit/Disposable.swift index 5287ac1..28fa733 100644 --- a/SwiftSignalKit/Disposable.swift +++ b/SwiftSignalKit/Disposable.swift @@ -1,6 +1,6 @@ import Foundation -public protocol Disposable: class { +public protocol Disposable: AnyObject { func dispose() } @@ -152,7 +152,7 @@ public final class DisposableSet : Disposable { public func remove(_ disposable: Disposable) { pthread_mutex_lock(&self.lock) - if let index = self.disposables.index(where: { $0 === disposable }) { + if let index = self.disposables.firstIndex(where: { $0 === disposable }) { self.disposables.remove(at: index) } pthread_mutex_unlock(&self.lock) diff --git a/SwiftSignalKit/Signal_Dispatch.swift b/SwiftSignalKit/Signal_Dispatch.swift index 2a921b2..f4392f4 100644 --- a/SwiftSignalKit/Signal_Dispatch.swift +++ b/SwiftSignalKit/Signal_Dispatch.swift @@ -30,19 +30,19 @@ public func deliverOn(_ threadPool: ThreadPool) -> (Signal) -> Signa let queue = threadPool.nextQueue() return signal.start(next: { next in queue.addTask(ThreadPoolTask { state in - if !state.cancelled.with { $0 } { + if !state.cancelled.with({ $0 }) { subscriber.putNext(next) } }) }, error: { error in queue.addTask(ThreadPoolTask { state in - if !state.cancelled.with { $0 } { + if !state.cancelled.with({ $0 }) { subscriber.putError(error) } }) }, completed: { queue.addTask(ThreadPoolTask { state in - if !state.cancelled.with { $0 } { + if !state.cancelled.with({ $0 }) { subscriber.putCompletion() } }) @@ -97,7 +97,7 @@ public func runOn(_ threadPool: ThreadPool) -> (Signal) -> Signal Bool { pthread_mutex_lock(&threadPool.mutex); if queue != nil { - if let index = threadPool.takenQueues.index(of: queue) { + if let index = threadPool.takenQueues.firstIndex(of: queue) { threadPool.takenQueues.remove(at: index) } @@ -97,7 +97,7 @@ public func ==(lhs: ThreadPoolQueue, rhs: ThreadPoolQueue) -> Bool { task = queue.popFirstTask() threadPool.takenQueues.append(queue) - if let index = threadPool.queues.index(of: queue) { + if let index = threadPool.queues.firstIndex(of: queue) { threadPool.queues.remove(at: index) } diff --git a/SwiftSignalKit/Timer.swift b/SwiftSignalKit/Timer.swift index d52aaae..af8738d 100644 --- a/SwiftSignalKit/Timer.swift +++ b/SwiftSignalKit/Timer.swift @@ -34,10 +34,10 @@ public final class Timer { if self.`repeat` { let time: DispatchTime = DispatchTime.now() + self.timeout - timer.scheduleRepeating(deadline: time, interval: self.timeout) + timer.schedule(deadline: time, repeating: self.timeout) } else { let time: DispatchTime = DispatchTime.now() + self.timeout - timer.scheduleOneshot(deadline: time) + timer.schedule(deadline: time) } timer.resume() diff --git a/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift b/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift index a7c4185..4ca69fb 100644 --- a/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift +++ b/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift @@ -101,7 +101,7 @@ class SwiftSignalKitFunctionsTests: XCTestCase { if true { var object: DeallocatingObject? = DeallocatingObject(deallocated: &deallocated) let signal = Signal { [object] subscriber in - subscriber.putError() + subscriber.putError(Void()) subscriber.putNext(1) return ActionDisposable { From a61fade6a5726da5b448249a09932b7cceb57079 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sat, 6 Nov 2021 17:56:18 +0800 Subject: [PATCH 2/9] Add SQueueLocalObject --- SSignalKit.xcodeproj/project.pbxproj | 8 ++++ SSignalKit/SAtomic.h | 12 +++--- SSignalKit/SBag.h | 6 +-- SSignalKit/SBlockDisposable.h | 2 +- SSignalKit/SDisposableSet.h | 4 +- SSignalKit/SMetaDisposable.h | 2 +- SSignalKit/SMulticastSignalManager.h | 8 ++-- SSignalKit/SQueue.h | 16 ++++---- SSignalKit/SQueueLocalObject.h | 19 +++++++++ SSignalKit/SQueueLocalObject.m | 40 +++++++++++++++++++ SSignalKit/SSignal+Accumulate.h | 4 +- SSignalKit/SSignal+Catch.h | 6 +-- SSignalKit/SSignal+Combine.h | 6 +-- SSignalKit/SSignal+Dispatch.h | 10 ++--- SSignalKit/SSignal+Mapping.h | 6 +-- SSignalKit/SSignal+Meta.h | 18 ++++----- SSignalKit/SSignal+Multicast.h | 2 +- SSignalKit/SSignal+Pipe.h | 6 +-- SSignalKit/SSignal+SideEffects.h | 14 +++---- SSignalKit/SSignal+Single.h | 8 ++-- SSignalKit/SSignal+Take.h | 6 +-- SSignalKit/SSignal+Timing.h | 6 +-- SSignalKit/SSignal.h | 12 +++--- SSignalKit/SSignalKit.h | 9 +---- SSignalKit/SSubscriber.h | 10 ++--- SSignalKit/SThreadPool.h | 8 ++-- SSignalKit/SThreadPoolQueue.h | 6 +-- SSignalKit/SThreadPoolTask.h | 2 +- SSignalKit/STimer.h | 4 +- SSignalKit/SVariable.h | 6 +-- SwiftSignalKit/Bag.swift | 52 +++++++++++++++++++++++++ SwiftSignalKit/Multicast.swift | 3 -- SwiftSignalKit/QueueLocalObject.swift | 6 +-- SwiftSignalKit/Signal.swift | 2 +- SwiftSignalKit/Signal_Catch.swift | 49 +++++++++++++++++++++++ SwiftSignalKit/Signal_Combine.swift | 24 ++++++++++++ SwiftSignalKit/Signal_Mapping.swift | 12 +++--- SwiftSignalKit/Signal_Materialize.swift | 1 - SwiftSignalKit/ThreadPool.swift | 2 +- 39 files changed, 300 insertions(+), 117 deletions(-) create mode 100644 SSignalKit/SQueueLocalObject.h create mode 100644 SSignalKit/SQueueLocalObject.m diff --git a/SSignalKit.xcodeproj/project.pbxproj b/SSignalKit.xcodeproj/project.pbxproj index 671abd7..94d162f 100644 --- a/SSignalKit.xcodeproj/project.pbxproj +++ b/SSignalKit.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + BA8A67EC27368775005B94C7 /* SQueueLocalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = BA8A67EA27368774005B94C7 /* SQueueLocalObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BA8A67ED27368775005B94C7 /* SQueueLocalObject.m in Sources */ = {isa = PBXBuildFile; fileRef = BA8A67EB27368774005B94C7 /* SQueueLocalObject.m */; }; D0085AE71B28285400EAF753 /* SSignal+Timing.m in Sources */ = {isa = PBXBuildFile; fileRef = D0085AB11B28285400EAF753 /* SSignal+Timing.m */; }; D0085AE81B28285400EAF753 /* SThreadPool.m in Sources */ = {isa = PBXBuildFile; fileRef = D0085AB21B28285400EAF753 /* SThreadPool.m */; }; D0085AE91B28285400EAF753 /* SQueue.m in Sources */ = {isa = PBXBuildFile; fileRef = D0085AB31B28285400EAF753 /* SQueue.m */; }; @@ -145,6 +147,8 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + BA8A67EA27368774005B94C7 /* SQueueLocalObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQueueLocalObject.h; sourceTree = ""; }; + BA8A67EB27368774005B94C7 /* SQueueLocalObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SQueueLocalObject.m; sourceTree = ""; }; D0085AB11B28285400EAF753 /* SSignal+Timing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "SSignal+Timing.m"; sourceTree = ""; }; D0085AB21B28285400EAF753 /* SThreadPool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SThreadPool.m; sourceTree = ""; }; D0085AB31B28285400EAF753 /* SQueue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SQueue.m; sourceTree = ""; }; @@ -404,6 +408,8 @@ D0085ACC1B28285400EAF753 /* SThreadPoolQueue.m */, D0085AC61B28285400EAF753 /* SQueue.h */, D0085AB31B28285400EAF753 /* SQueue.m */, + BA8A67EA27368774005B94C7 /* SQueueLocalObject.h */, + BA8A67EB27368774005B94C7 /* SQueueLocalObject.m */, D0085AE51B28285400EAF753 /* STimer.h */, D0085AE61B28285400EAF753 /* STimer.m */, D0085AD51B28285400EAF753 /* SSignal.h */, @@ -510,6 +516,7 @@ D0085B151B28285400EAF753 /* SDisposableSet.h in Headers */, D0085B0C1B28285400EAF753 /* SSignal+Mapping.h in Headers */, D0085AFC1B28285400EAF753 /* SQueue.h in Headers */, + BA8A67EC27368775005B94C7 /* SQueueLocalObject.h in Headers */, D0085B031B28285400EAF753 /* SThreadPoolQueue.h in Headers */, D0085B091B28285400EAF753 /* SSubscriber.h in Headers */, D0085B041B28285400EAF753 /* SThreadPool.h in Headers */, @@ -780,6 +787,7 @@ D0085B101B28285400EAF753 /* SAtomic.m in Sources */, D0085B121B28285400EAF753 /* SBag.m in Sources */, D0085AEE1B28285400EAF753 /* SSignal.m in Sources */, + BA8A67ED27368775005B94C7 /* SQueueLocalObject.m in Sources */, D0085B021B28285400EAF753 /* SThreadPoolQueue.m in Sources */, D0085AFF1B28285400EAF753 /* SSubscriber.m in Sources */, D0085B081B28285400EAF753 /* SSignal+Multicast.m in Sources */, diff --git a/SSignalKit/SAtomic.h b/SSignalKit/SAtomic.h index 6d3e35b..3e29f89 100644 --- a/SSignalKit/SAtomic.h +++ b/SSignalKit/SAtomic.h @@ -2,11 +2,11 @@ @interface SAtomic : NSObject -- (instancetype)initWithValue:(id)value; -- (instancetype)initWithValue:(id)value recursive:(bool)recursive; -- (id)swap:(id)newValue; -- (id)value; -- (id)modify:(id (^)(id))f; -- (id)with:(id (^)(id))f; +- (instancetype _Nonnull)initWithValue:(id _Nullable)value; +- (instancetype _Nonnull)initWithValue:(id _Nullable)value recursive:(bool)recursive; +- (id _Nullable)swap:(id _Nullable)newValue; +- (id _Nullable)value; +- (id _Nullable)modify:(id _Nullable (^ _Nonnull)(id _Nullable))f; +- (id _Nullable)with:(id _Nullable (^ _Nonnull)(id _Nullable))f; @end diff --git a/SSignalKit/SBag.h b/SSignalKit/SBag.h index 7b79ead..6d9ca7a 100644 --- a/SSignalKit/SBag.h +++ b/SSignalKit/SBag.h @@ -2,10 +2,10 @@ @interface SBag : NSObject -- (NSInteger)addItem:(id)item; -- (void)enumerateItems:(void (^)(id))block; +- (NSInteger)addItem:(id _Nonnull)item; +- (void)enumerateItems:(void (^ _Nonnull)(id _Nonnull))block; - (void)removeItem:(NSInteger)key; - (bool)isEmpty; -- (NSArray *)copyItems; +- (NSArray * _Nonnull)copyItems; @end diff --git a/SSignalKit/SBlockDisposable.h b/SSignalKit/SBlockDisposable.h index 9b82339..ff101df 100644 --- a/SSignalKit/SBlockDisposable.h +++ b/SSignalKit/SBlockDisposable.h @@ -2,6 +2,6 @@ @interface SBlockDisposable : NSObject -- (instancetype)initWithBlock:(void (^)(void))block; +- (instancetype _Nonnull)initWithBlock:(void (^ _Nullable)(void))block; @end diff --git a/SSignalKit/SDisposableSet.h b/SSignalKit/SDisposableSet.h index 7d7515c..e7ec5b4 100644 --- a/SSignalKit/SDisposableSet.h +++ b/SSignalKit/SDisposableSet.h @@ -4,7 +4,7 @@ @interface SDisposableSet : NSObject -- (void)add:(id)disposable; -- (void)remove:(id)disposable; +- (void)add:(id _Nonnull)disposable; +- (void)remove:(id _Nonnull)disposable; @end diff --git a/SSignalKit/SMetaDisposable.h b/SSignalKit/SMetaDisposable.h index 8938f9e..e22e797 100644 --- a/SSignalKit/SMetaDisposable.h +++ b/SSignalKit/SMetaDisposable.h @@ -2,6 +2,6 @@ @interface SMetaDisposable : NSObject -- (void)setDisposable:(id)disposable; +- (void)setDisposable:(id _Nullable)disposable; @end diff --git a/SSignalKit/SMulticastSignalManager.h b/SSignalKit/SMulticastSignalManager.h index cebd7e7..449deb8 100644 --- a/SSignalKit/SMulticastSignalManager.h +++ b/SSignalKit/SMulticastSignalManager.h @@ -2,10 +2,10 @@ @interface SMulticastSignalManager : NSObject -- (SSignal *)multicastedSignalForKey:(NSString *)key producer:(SSignal *(^)(void))producer; -- (void)startStandaloneSignalIfNotRunningForKey:(NSString *)key producer:(SSignal *(^)(void))producer; +- (SSignal * _Nonnull)multicastedSignalForKey:(NSString * _Nonnull)key producer:(SSignal * _Nonnull (^ _Nonnull)(void))producer; +- (void)startStandaloneSignalIfNotRunningForKey:(NSString * _Nonnull)key producer:(SSignal * _Nonnull (^ _Nonnull)(void))producer; -- (SSignal *)multicastedPipeForKey:(NSString *)key; -- (void)putNext:(id)next toMulticastedPipeForKey:(NSString *)key; +- (SSignal * _Nonnull)multicastedPipeForKey:(NSString * _Nonnull)key; +- (void)putNext:(id _Nullable)next toMulticastedPipeForKey:(NSString * _Nonnull)key; @end diff --git a/SSignalKit/SQueue.h b/SSignalKit/SQueue.h index 228334c..9f45afd 100644 --- a/SSignalKit/SQueue.h +++ b/SSignalKit/SQueue.h @@ -2,17 +2,17 @@ @interface SQueue : NSObject -+ (SQueue *)mainQueue; -+ (SQueue *)concurrentDefaultQueue; -+ (SQueue *)concurrentBackgroundQueue; ++ (SQueue * _Nonnull)mainQueue; ++ (SQueue * _Nonnull)concurrentDefaultQueue; ++ (SQueue * _Nonnull)concurrentBackgroundQueue; -+ (SQueue *)wrapConcurrentNativeQueue:(dispatch_queue_t)nativeQueue; ++ (SQueue * _Nonnull)wrapConcurrentNativeQueue:(dispatch_queue_t _Nonnull)nativeQueue; -- (void)dispatch:(dispatch_block_t)block; -- (void)dispatchSync:(dispatch_block_t)block; -- (void)dispatch:(dispatch_block_t)block synchronous:(bool)synchronous; +- (void)dispatch:(dispatch_block_t _Nonnull)block; +- (void)dispatchSync:(dispatch_block_t _Nonnull)block; +- (void)dispatch:(dispatch_block_t _Nonnull)block synchronous:(bool)synchronous; -- (dispatch_queue_t)_dispatch_queue; +- (dispatch_queue_t _Nonnull)_dispatch_queue; - (bool)isCurrentQueue; diff --git a/SSignalKit/SQueueLocalObject.h b/SSignalKit/SQueueLocalObject.h new file mode 100644 index 0000000..85fdfd2 --- /dev/null +++ b/SSignalKit/SQueueLocalObject.h @@ -0,0 +1,19 @@ +// +// SQueueLocalObject.h +// SSignalKit +// +// Created by Mikhail Filimonov on 13.01.2021. +// Copyright © 2021 Telegram. All rights reserved. +// + +#import +#import +NS_ASSUME_NONNULL_BEGIN + +@interface SQueueLocalObject : NSObject +-(id)initWithQueue:(SQueue *)queue generate:(id (^)(void))next; +-(void)with:(void (^)(id object))f; +@end + +NS_ASSUME_NONNULL_END + diff --git a/SSignalKit/SQueueLocalObject.m b/SSignalKit/SQueueLocalObject.m new file mode 100644 index 0000000..0b12201 --- /dev/null +++ b/SSignalKit/SQueueLocalObject.m @@ -0,0 +1,40 @@ +// +// SQueueLocalObject.m +// SSignalKit +// +// Created by Mikhail Filimonov on 13.01.2021. +// Copyright © 2021 Telegram. All rights reserved. +// + +#import "SQueueLocalObject.h" + +@implementation SQueueLocalObject { + SQueue *_queue; + id valueRef; +} +-(id)initWithQueue:(SQueue *)queue generate:(id _Nonnull (^)(void))next { + if (self = [super init]) { + self->_queue = queue; + [queue dispatch:^{ + self->valueRef = next(); + }]; + } + return self; +} + +-(void)with:(void (^)(id object))f { + [self->_queue dispatch:^{ + f(self->valueRef); + }]; +} + +-(void)dealloc { + __block id value = self->valueRef; + self->valueRef = nil; + [_queue dispatch:^{ + value = nil; + }]; +} + +@end + diff --git a/SSignalKit/SSignal+Accumulate.h b/SSignalKit/SSignal+Accumulate.h index 1ea8a51..8c17743 100644 --- a/SSignalKit/SSignal+Accumulate.h +++ b/SSignalKit/SSignal+Accumulate.h @@ -2,7 +2,7 @@ @interface SSignal (Accumulate) -- (SSignal *)reduceLeft:(id)value with:(id (^)(id, id))f; -- (SSignal *)reduceLeftWithPassthrough:(id)value with:(id (^)(id, id, void (^)(id)))f; +- (SSignal * _Nonnull)reduceLeft:(id _Nullable)value with:(id _Nullable (^ _Nonnull)(id _Nullable, id _Nullable))f; +- (SSignal * _Nonnull)reduceLeftWithPassthrough:(id _Nullable)value with:(id _Nullable (^ _Nonnull)(id _Nullable, id _Nullable, void (^ _Nonnull)(id _Nullable)))f; @end diff --git a/SSignalKit/SSignal+Catch.h b/SSignalKit/SSignal+Catch.h index dc8898c..43e8029 100644 --- a/SSignalKit/SSignal+Catch.h +++ b/SSignalKit/SSignal+Catch.h @@ -2,8 +2,8 @@ @interface SSignal (Catch) -- (SSignal *)catch:(SSignal *(^)(id error))f; -- (SSignal *)restart; -- (SSignal *)retryIf:(bool (^)(id error))predicate; +- (SSignal * _Nonnull)catch:(SSignal * _Nonnull (^ _Nonnull )(id _Nullable error))f; +- (SSignal * _Nonnull)restart; +- (SSignal * _Nonnull)retryIf:(bool (^ _Nonnull)(id _Nullable error))predicate; @end diff --git a/SSignalKit/SSignal+Combine.h b/SSignalKit/SSignal+Combine.h index d84e065..2038e06 100644 --- a/SSignalKit/SSignal+Combine.h +++ b/SSignalKit/SSignal+Combine.h @@ -2,9 +2,9 @@ @interface SSignal (Combine) -+ (SSignal *)combineSignals:(NSArray *)signals; -+ (SSignal *)combineSignals:(NSArray *)signals withInitialStates:(NSArray *)initialStates; ++ (SSignal * _Nonnull)combineSignals:(NSArray * _Nonnull)signals; ++ (SSignal * _Nonnull)combineSignals:(NSArray * _Nonnull)signals withInitialStates:(NSArray * _Nullable)initialStates; -+ (SSignal *)mergeSignals:(NSArray *)signals; ++ (SSignal * _Nonnull)mergeSignals:(NSArray * _Nonnull)signals; @end diff --git a/SSignalKit/SSignal+Dispatch.h b/SSignalKit/SSignal+Dispatch.h index a22679b..21d0bfb 100644 --- a/SSignalKit/SSignal+Dispatch.h +++ b/SSignalKit/SSignal+Dispatch.h @@ -5,10 +5,10 @@ @interface SSignal (Dispatch) -- (SSignal *)deliverOn:(SQueue *)queue; -- (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool; -- (SSignal *)startOn:(SQueue *)queue; -- (SSignal *)startOnThreadPool:(SThreadPool *)threadPool; -- (SSignal *)throttleOn:(SQueue *)queue delay:(NSTimeInterval)delay; +- (SSignal * _Nonnull)deliverOn:(SQueue * _Nonnull)queue; +- (SSignal * _Nonnull)deliverOnThreadPool:(SThreadPool * _Nonnull)threadPool; +- (SSignal * _Nonnull)startOn:(SQueue * _Nonnull)queue; +- (SSignal * _Nonnull)startOnThreadPool:(SThreadPool * _Nonnull)threadPool; +- (SSignal * _Nonnull)throttleOn:(SQueue * _Nonnull)queue delay:(NSTimeInterval)delay; @end diff --git a/SSignalKit/SSignal+Mapping.h b/SSignalKit/SSignal+Mapping.h index 81a1681..75fb909 100644 --- a/SSignalKit/SSignal+Mapping.h +++ b/SSignalKit/SSignal+Mapping.h @@ -2,8 +2,8 @@ @interface SSignal (Mapping) -- (SSignal *)map:(id (^)(id))f; -- (SSignal *)filter:(bool (^)(id))f; -- (SSignal *)ignoreRepeated; +- (SSignal * _Nonnull)map:(id _Nullable (^ _Nonnull)(id _Nullable))f; +- (SSignal * _Nonnull)filter:(bool (^ _Nonnull)(id _Nullable))f; +- (SSignal * _Nonnull)ignoreRepeated; @end diff --git a/SSignalKit/SSignal+Meta.h b/SSignalKit/SSignal+Meta.h index a66af4f..caa4c3a 100644 --- a/SSignalKit/SSignal+Meta.h +++ b/SSignalKit/SSignal+Meta.h @@ -4,19 +4,19 @@ @interface SSignal (Meta) -- (SSignal *)switchToLatest; -- (SSignal *)mapToSignal:(SSignal *(^)(id))f; -- (SSignal *)mapToQueue:(SSignal *(^)(id))f; -- (SSignal *)mapToThrottled:(SSignal *(^)(id))f; -- (SSignal *)then:(SSignal *)signal; -- (SSignal *)queue; -- (SSignal *)throttled; -+ (SSignal *)defer:(SSignal *(^)(void))generator; +- (SSignal * _Nonnull)switchToLatest; +- (SSignal * _Nonnull)mapToSignal:(SSignal * _Nonnull (^ _Nonnull)(id _Nullable))f; +- (SSignal * _Nonnull)mapToQueue:(SSignal * _Nonnull (^ _Nonnull)(id _Nullable))f; +- (SSignal * _Nonnull)mapToThrottled:(SSignal * _Nonnull (^ _Nonnull)(id _Nullable))f; +- (SSignal * _Nonnull)then:(SSignal * _Nonnull)signal; +- (SSignal * _Nonnull)queue; +- (SSignal * _Nonnull)throttled; ++ (SSignal * _Nonnull)defer:(SSignal * _Nonnull(^ _Nonnull)(void))generator; @end @interface SSignalQueue : NSObject -- (SSignal *)enqueue:(SSignal *)signal; +- (SSignal * _Nonnull)enqueue:(SSignal * _Nonnull)signal; @end diff --git a/SSignalKit/SSignal+Multicast.h b/SSignalKit/SSignal+Multicast.h index e0720cc..817f3a7 100644 --- a/SSignalKit/SSignal+Multicast.h +++ b/SSignalKit/SSignal+Multicast.h @@ -2,6 +2,6 @@ @interface SSignal (Multicast) -- (SSignal *)multicast; +- (SSignal * _Nonnull)multicast; @end diff --git a/SSignalKit/SSignal+Pipe.h b/SSignalKit/SSignal+Pipe.h index d8a5a08..ac09fde 100644 --- a/SSignalKit/SSignal+Pipe.h +++ b/SSignalKit/SSignal+Pipe.h @@ -2,10 +2,10 @@ @interface SPipe : NSObject -@property (nonatomic, copy, readonly) SSignal *(^signalProducer)(void); -@property (nonatomic, copy, readonly) void (^sink)(id); +@property (nonatomic, copy, readonly) SSignal * _Nonnull (^ _Nonnull signalProducer)(void); +@property (nonatomic, copy, readonly) void (^ _Nonnull sink)(id _Nullable); -- (instancetype)initWithReplay:(bool)replay; +- (instancetype _Nonnull)initWithReplay:(bool)replay; @end diff --git a/SSignalKit/SSignal+SideEffects.h b/SSignalKit/SSignal+SideEffects.h index 1e1be9e..787661e 100644 --- a/SSignalKit/SSignal+SideEffects.h +++ b/SSignalKit/SSignal+SideEffects.h @@ -2,12 +2,12 @@ @interface SSignal (SideEffects) -- (SSignal *)onStart:(void (^)(void))f; -- (SSignal *)onNext:(void (^)(id next))f; -- (SSignal *)afterNext:(void (^)(id next))f; -- (SSignal *)onError:(void (^)(id error))f; -- (SSignal *)onCompletion:(void (^)(void))f; -- (SSignal *)afterCompletion:(void (^)(void))f; -- (SSignal *)onDispose:(void (^)(void))f; +- (SSignal * _Nonnull)onStart:(void (^ _Nonnull)(void))f; +- (SSignal * _Nonnull)onNext:(void (^ _Nonnull)(id _Nullable next))f; +- (SSignal * _Nonnull)afterNext:(void (^ _Nonnull)(id _Nullable next))f; +- (SSignal * _Nonnull)onError:(void (^ _Nonnull)(id _Nullable error))f; +- (SSignal * _Nonnull)onCompletion:(void (^ _Nonnull)(void))f; +- (SSignal * _Nonnull)afterCompletion:(void (^ _Nonnull)(void))f; +- (SSignal * _Nonnull)onDispose:(void (^ _Nonnull)(void))f; @end diff --git a/SSignalKit/SSignal+Single.h b/SSignalKit/SSignal+Single.h index 75f48ff..46693c0 100644 --- a/SSignalKit/SSignal+Single.h +++ b/SSignalKit/SSignal+Single.h @@ -2,9 +2,9 @@ @interface SSignal (Single) -+ (SSignal *)single:(id)next; -+ (SSignal *)fail:(id)error; -+ (SSignal *)never; -+ (SSignal *)complete; ++ (SSignal * _Nonnull)single:(id _Nullable)next; ++ (SSignal * _Nonnull)fail:(id _Nullable)error; ++ (SSignal * _Nonnull)never; ++ (SSignal * _Nonnull)complete; @end diff --git a/SSignalKit/SSignal+Take.h b/SSignalKit/SSignal+Take.h index a4d1ff2..9128e4a 100644 --- a/SSignalKit/SSignal+Take.h +++ b/SSignalKit/SSignal+Take.h @@ -2,8 +2,8 @@ @interface SSignal (Take) -- (SSignal *)take:(NSUInteger)count; -- (SSignal *)takeLast; -- (SSignal *)takeUntilReplacement:(SSignal *)replacement; +- (SSignal * _Nonnull)take:(NSUInteger)count; +- (SSignal * _Nonnull)takeLast; +- (SSignal * _Nonnull)takeUntilReplacement:(SSignal * _Nonnull)replacement; @end diff --git a/SSignalKit/SSignal+Timing.h b/SSignalKit/SSignal+Timing.h index 4b5d50c..ae4c7d4 100644 --- a/SSignalKit/SSignal+Timing.h +++ b/SSignalKit/SSignal+Timing.h @@ -4,8 +4,8 @@ @interface SSignal (Timing) -- (SSignal *)delay:(NSTimeInterval)seconds onQueue:(SQueue *)queue; -- (SSignal *)timeout:(NSTimeInterval)seconds onQueue:(SQueue *)queue orSignal:(SSignal *)signal; -- (SSignal *)wait:(NSTimeInterval)seconds; +- (SSignal * _Nonnull)delay:(NSTimeInterval)seconds onQueue:(SQueue * _Nonnull)queue; +- (SSignal * _Nonnull)timeout:(NSTimeInterval)seconds onQueue:(SQueue * _Nonnull)queue orSignal:(SSignal * _Nonnull)signal; +- (SSignal * _Nonnull)wait:(NSTimeInterval)seconds; @end diff --git a/SSignalKit/SSignal.h b/SSignalKit/SSignal.h index ef5c63a..c3d304b 100644 --- a/SSignalKit/SSignal.h +++ b/SSignalKit/SSignal.h @@ -3,16 +3,16 @@ @interface SSignal : NSObject { @public - id (^_generator)(SSubscriber *); + id _Nullable (^ _Nonnull _generator)(SSubscriber * _Nonnull); } -- (instancetype)initWithGenerator:(id (^)(SSubscriber *))generator; +- (instancetype _Nonnull)initWithGenerator:(id _Nullable (^ _Nonnull)(SSubscriber * _Nonnull))generator; -- (id)startWithNext:(void (^)(id next))next error:(void (^)(id error))error completed:(void (^)(void))completed; -- (id)startWithNext:(void (^)(id next))next; -- (id)startWithNext:(void (^)(id next))next completed:(void (^)(void))completed; +- (id _Nullable)startWithNext:(void (^ _Nullable)(id _Nullable next))next error:(void (^ _Nullable)(id _Nullable error))error completed:(void (^ _Nullable)(void))completed; +- (id _Nullable)startWithNext:(void (^ _Nullable)(id _Nullable next))next; +- (id _Nullable)startWithNext:(void (^ _Nullable)(id _Nullable next))next completed:(void (^ _Nullable)(void))completed; -- (SSignal *)trace:(NSString *)name; +- (SSignal * _Nonnull)trace:(NSString * _Nonnull)name; @end diff --git a/SSignalKit/SSignalKit.h b/SSignalKit/SSignalKit.h index 9842a18..2cc7c97 100644 --- a/SSignalKit/SSignalKit.h +++ b/SSignalKit/SSignalKit.h @@ -1,11 +1,3 @@ -// -// SSignalKit.h -// SSignalKit -// -// Created by Peter on 31/01/15. -// Copyright (c) 2015 Telegram. All rights reserved. -// - #if __IPHONE_OS_VERSION_MIN_REQUIRED #import #else @@ -43,3 +35,4 @@ FOUNDATION_EXPORT const unsigned char SSignalKitVersionString[]; #import #import #import +#import diff --git a/SSignalKit/SSubscriber.h b/SSignalKit/SSubscriber.h index 67aa8b8..12547bc 100644 --- a/SSignalKit/SSubscriber.h +++ b/SSignalKit/SSubscriber.h @@ -4,19 +4,19 @@ { } -- (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error completed:(void (^)(void))completed; +- (instancetype _Nonnull)initWithNext:(void (^ _Nullable)(id _Nullable))next error:(void (^ _Nullable)(id _Nullable))error completed:(void (^ _Nullable)(void))completed; -- (void)_assignDisposable:(id)disposable; +- (void)_assignDisposable:(id _Nullable)disposable; - (void)_markTerminatedWithoutDisposal; -- (void)putNext:(id)next; -- (void)putError:(id)error; +- (void)putNext:(id _Nullable)next; +- (void)putError:(id _Nullable)error; - (void)putCompletion; @end @interface STracingSubscriber : SSubscriber -- (instancetype)initWithName:(NSString *)name next:(void (^)(id))next error:(void (^)(id))error completed:(void (^)(void))completed; +- (instancetype _Nonnull)initWithName:(NSString * _Nonnull)name next:(void (^ _Nullable)(id _Nullable))next error:(void (^ _Nullable)(id _Nullable))error completed:(void (^ _Nullable)(void))completed; @end diff --git a/SSignalKit/SThreadPool.h b/SSignalKit/SThreadPool.h index 46c7b4f..b249a1f 100644 --- a/SSignalKit/SThreadPool.h +++ b/SSignalKit/SThreadPool.h @@ -5,11 +5,11 @@ @interface SThreadPool : NSObject -- (instancetype)initWithThreadCount:(NSUInteger)threadCount threadPriority:(double)threadPriority; +- (instancetype _Nonnull)initWithThreadCount:(NSUInteger)threadCount threadPriority:(double)threadPriority; -- (void)addTask:(SThreadPoolTask *)task; +- (void)addTask:(SThreadPoolTask * _Nonnull)task; -- (SThreadPoolQueue *)nextQueue; -- (void)_workOnQueue:(SThreadPoolQueue *)queue block:(void (^)(void))block; +- (SThreadPoolQueue * _Nonnull)nextQueue; +- (void)_workOnQueue:(SThreadPoolQueue * _Nonnull)queue block:(void (^ _Nonnull)(void))block; @end diff --git a/SSignalKit/SThreadPoolQueue.h b/SSignalKit/SThreadPoolQueue.h index 3d8d53b..51d6300 100644 --- a/SSignalKit/SThreadPoolQueue.h +++ b/SSignalKit/SThreadPoolQueue.h @@ -5,9 +5,9 @@ @interface SThreadPoolQueue : NSObject -- (instancetype)initWithThreadPool:(SThreadPool *)threadPool; -- (void)addTask:(SThreadPoolTask *)task; -- (SThreadPoolTask *)_popFirstTask; +- (instancetype _Nonnull)initWithThreadPool:(SThreadPool * _Nonnull)threadPool; +- (void)addTask:(SThreadPoolTask * _Nonnull)task; +- (SThreadPoolTask * _Nullable)_popFirstTask; - (bool)_hasTasks; @end diff --git a/SSignalKit/SThreadPoolTask.h b/SSignalKit/SThreadPoolTask.h index cc1a542..2f3b100 100644 --- a/SSignalKit/SThreadPoolTask.h +++ b/SSignalKit/SThreadPoolTask.h @@ -2,7 +2,7 @@ @interface SThreadPoolTask : NSObject -- (instancetype)initWithBlock:(void (^)(bool (^)(void)))block; +- (instancetype _Nonnull)initWithBlock:(void (^ _Nonnull)(bool (^ _Nonnull)(void)))block; - (void)execute; - (void)cancel; diff --git a/SSignalKit/STimer.h b/SSignalKit/STimer.h index 621e423..0ad33b4 100644 --- a/SSignalKit/STimer.h +++ b/SSignalKit/STimer.h @@ -4,8 +4,8 @@ @interface STimer : NSObject -- (id)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion queue:(SQueue *)queue; -- (id)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion nativeQueue:(dispatch_queue_t)nativeQueue; +- (instancetype _Nonnull)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t _Nonnull)completion queue:(SQueue * _Nonnull)queue; +- (instancetype _Nonnull)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t _Nonnull)completion nativeQueue:(dispatch_queue_t _Nonnull)nativeQueue; - (void)start; - (void)invalidate; diff --git a/SSignalKit/SVariable.h b/SSignalKit/SVariable.h index 47d51a1..ffd3fe7 100644 --- a/SSignalKit/SVariable.h +++ b/SSignalKit/SVariable.h @@ -4,9 +4,9 @@ @interface SVariable : NSObject -- (instancetype)init; +- (instancetype _Nonnull)init; -- (void)set:(SSignal *)signal; -- (SSignal *)signal; +- (void)set:(SSignal * _Nonnull)signal; +- (SSignal * _Nonnull)signal; @end diff --git a/SwiftSignalKit/Bag.swift b/SwiftSignalKit/Bag.swift index 08d5aef..59d287b 100644 --- a/SwiftSignalKit/Bag.swift +++ b/SwiftSignalKit/Bag.swift @@ -1,5 +1,17 @@ import Foundation +public final class Weak { + private weak var _value: T? + + public var value: T? { + return self._value + } + + public init(_ value: T) { + self._value = value + } +} + public final class Bag { public typealias Index = Int private var nextIndex: Index = 0 @@ -73,6 +85,46 @@ public final class Bag { } } +public final class SparseBag: Sequence { + public typealias Index = Int + private var nextIndex: Index = 0 + private var items: [Index: T] = [:] + + public init() { + } + + public func add(_ item: T) -> Index { + let key = self.nextIndex + self.nextIndex += 1 + self.items[key] = item + + return key + } + + public func get(_ index: Index) -> T? { + return self.items[index] + } + + public func remove(_ index: Index) { + self.items.removeValue(forKey: index) + } + + public func removeAll() { + self.items.removeAll() + } + + public var isEmpty: Bool { + return self.items.isEmpty + } + + public func makeIterator() -> AnyIterator { + var iterator = self.items.makeIterator() + return AnyIterator { () -> T? in + return iterator.next()?.value + } + } +} + public final class CounterBag { private var nextIndex: Int = 1 private var items = Set() diff --git a/SwiftSignalKit/Multicast.swift b/SwiftSignalKit/Multicast.swift index b1ddec5..8aff97a 100644 --- a/SwiftSignalKit/Multicast.swift +++ b/SwiftSignalKit/Multicast.swift @@ -48,9 +48,6 @@ public final class Multicast { subscriber(next) } }, error: { _ in - self.lock.locked { - let _ = self.instances.removeValue(forKey: key) - } }, completed: { self.lock.locked { self.instances.removeValue(forKey: key) diff --git a/SwiftSignalKit/QueueLocalObject.swift b/SwiftSignalKit/QueueLocalObject.swift index c30d0f4..9265f75 100644 --- a/SwiftSignalKit/QueueLocalObject.swift +++ b/SwiftSignalKit/QueueLocalObject.swift @@ -1,7 +1,7 @@ import Foundation public final class QueueLocalObject { - private let queue: Queue + public let queue: Queue private var valueRef: Unmanaged? public init(queue: Queue, generate: @escaping () -> T) { @@ -29,7 +29,7 @@ public final class QueueLocalObject { } } - public func syncWith(_ f: @escaping (T) -> R) -> R? { + public func syncWith(_ f: @escaping (T) -> R) -> R { var result: R? self.queue.sync { if let valueRef = self.valueRef { @@ -37,7 +37,7 @@ public final class QueueLocalObject { result = f(value) } } - return result + return result! } public func signalWith(_ f: @escaping (T, Subscriber) -> Disposable) -> Signal { diff --git a/SwiftSignalKit/Signal.swift b/SwiftSignalKit/Signal.swift index 1bedb50..cdde287 100644 --- a/SwiftSignalKit/Signal.swift +++ b/SwiftSignalKit/Signal.swift @@ -38,7 +38,7 @@ private final class SubscriberDisposable : Disposable { } } -public struct Signal { +public final class Signal { private let generator: (Subscriber) -> Disposable public init(_ generator: @escaping(Subscriber) -> Disposable) { diff --git a/SwiftSignalKit/Signal_Catch.swift b/SwiftSignalKit/Signal_Catch.swift index 896b41b..077c97d 100644 --- a/SwiftSignalKit/Signal_Catch.swift +++ b/SwiftSignalKit/Signal_Catch.swift @@ -135,6 +135,55 @@ public func retry(_ delayIncrement: Double, maxDelay: Double, onQueue queu } } +public func retry(retryOnError: @escaping (E) -> Bool, delayIncrement: Double, maxDelay: Double, maxRetries: Int, onQueue queue: Queue) -> (_ signal: Signal) -> Signal { + return { signal in + return Signal { subscriber in + let shouldRetry = Atomic(value: true) + let currentDelay = Atomic<(Double, Int)>(value: (0.0, 0)) + let currentDisposable = MetaDisposable() + + let start = recursiveFunction { recurse in + let currentShouldRetry = shouldRetry.with { value in + return value + } + if currentShouldRetry { + let disposable = signal.start(next: { next in + subscriber.putNext(next) + }, error: { error in + if !retryOnError(error) { + subscriber.putError(error) + } else { + let (delay, count) = currentDelay.modify { value, count in + return (min(maxDelay, value + delayIncrement), count + 1) + } + + if count >= maxRetries { + subscriber.putError(error) + } else { + let time: DispatchTime = DispatchTime.now() + Double(delay) + queue.queue.asyncAfter(deadline: time, execute: { + recurse() + }) + } + } + }, completed: { + let _ = shouldRetry.swap(false) + subscriber.putCompletion() + }) + currentDisposable.set(disposable) + } + } + + start() + + return ActionDisposable { + currentDisposable.dispose() + let _ = shouldRetry.swap(false) + } + } + } +} + public func restartIfError(_ signal: Signal) -> Signal { return Signal { subscriber in let shouldRetry = Atomic(value: true) diff --git a/SwiftSignalKit/Signal_Combine.swift b/SwiftSignalKit/Signal_Combine.swift index b0d0b97..8d3d923 100644 --- a/SwiftSignalKit/Signal_Combine.swift +++ b/SwiftSignalKit/Signal_Combine.swift @@ -148,6 +148,30 @@ public func combineLatest(queue: Que }, initialValues: [:], queue: queue) } +public func combineLatest(queue: Queue? = nil, _ s1: Signal, _ s2: Signal, _ s3: Signal, _ s4: Signal, _ s5: Signal, _ s6: Signal, _ s7: Signal, _ s8: Signal, _ s9: Signal, _ s10: Signal, _ s11: Signal) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11), E> { + return combineLatestAny([signalOfAny(s1), signalOfAny(s2), signalOfAny(s3), signalOfAny(s4), signalOfAny(s5), signalOfAny(s6), signalOfAny(s7), signalOfAny(s8), signalOfAny(s9), signalOfAny(s10), signalOfAny(s11)], combine: { values in + return (values[0] as! T1, values[1] as! T2, values[2] as! T3, values[3] as! T4, values[4] as! T5, values[5] as! T6, values[6] as! T7, values[7] as! T8, values[8] as! T9, values[9] as! T10, values[10] as! T11) + }, initialValues: [:], queue: queue) +} + +public func combineLatest(queue: Queue? = nil, _ s1: Signal, _ s2: Signal, _ s3: Signal, _ s4: Signal, _ s5: Signal, _ s6: Signal, _ s7: Signal, _ s8: Signal, _ s9: Signal, _ s10: Signal, _ s11: Signal, _ s12: Signal) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12), E> { + return combineLatestAny([signalOfAny(s1), signalOfAny(s2), signalOfAny(s3), signalOfAny(s4), signalOfAny(s5), signalOfAny(s6), signalOfAny(s7), signalOfAny(s8), signalOfAny(s9), signalOfAny(s10), signalOfAny(s11), signalOfAny(s12)], combine: { values in + return (values[0] as! T1, values[1] as! T2, values[2] as! T3, values[3] as! T4, values[4] as! T5, values[5] as! T6, values[6] as! T7, values[7] as! T8, values[8] as! T9, values[9] as! T10, values[10] as! T11, values[11] as! T12) + }, initialValues: [:], queue: queue) +} + +public func combineLatest(queue: Queue? = nil, _ s1: Signal, _ s2: Signal, _ s3: Signal, _ s4: Signal, _ s5: Signal, _ s6: Signal, _ s7: Signal, _ s8: Signal, _ s9: Signal, _ s10: Signal, _ s11: Signal, _ s12: Signal, _ s13: Signal) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13), E> { + return combineLatestAny([signalOfAny(s1), signalOfAny(s2), signalOfAny(s3), signalOfAny(s4), signalOfAny(s5), signalOfAny(s6), signalOfAny(s7), signalOfAny(s8), signalOfAny(s9), signalOfAny(s10), signalOfAny(s11), signalOfAny(s12), signalOfAny(s13)], combine: { values in + return (values[0] as! T1, values[1] as! T2, values[2] as! T3, values[3] as! T4, values[4] as! T5, values[5] as! T6, values[6] as! T7, values[7] as! T8, values[8] as! T9, values[9] as! T10, values[10] as! T11, values[11] as! T12, values[12] as! T13) + }, initialValues: [:], queue: queue) +} + +public func combineLatest(queue: Queue? = nil, _ s1: Signal, _ s2: Signal, _ s3: Signal, _ s4: Signal, _ s5: Signal, _ s6: Signal, _ s7: Signal, _ s8: Signal, _ s9: Signal, _ s10: Signal, _ s11: Signal, _ s12: Signal, _ s13: Signal, _ s14: Signal) -> Signal<(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14), E> { + return combineLatestAny([signalOfAny(s1), signalOfAny(s2), signalOfAny(s3), signalOfAny(s4), signalOfAny(s5), signalOfAny(s6), signalOfAny(s7), signalOfAny(s8), signalOfAny(s9), signalOfAny(s10), signalOfAny(s11), signalOfAny(s12), signalOfAny(s13), signalOfAny(s14)], combine: { values in + return (values[0] as! T1, values[1] as! T2, values[2] as! T3, values[3] as! T4, values[4] as! T5, values[5] as! T6, values[6] as! T7, values[7] as! T8, values[8] as! T9, values[9] as! T10, values[10] as! T11, values[11] as! T12, values[12] as! T13, values[13] as! T14) + }, initialValues: [:], queue: queue) +} + public func combineLatest(queue: Queue? = nil, _ signals: [Signal]) -> Signal<[T], E> { if signals.count == 0 { return single([T](), E.self) diff --git a/SwiftSignalKit/Signal_Mapping.swift b/SwiftSignalKit/Signal_Mapping.swift index d8a1b3c..d0680b9 100644 --- a/SwiftSignalKit/Signal_Mapping.swift +++ b/SwiftSignalKit/Signal_Mapping.swift @@ -30,12 +30,14 @@ public func filter(_ f: @escaping(T) -> Bool) -> (Signal) -> Signal< } } -public func flatMap(_ f: @escaping (T) -> R?) -> (Signal) -> Signal { +public func flatMap(_ f: @escaping (T) -> R) -> (Signal) -> Signal { return { signal in - return Signal { subscriber in + return Signal { subscriber in return signal.start(next: { next in - if let value = f(next) { - subscriber.putNext(value) + if let next = next { + subscriber.putNext(f(next)) + } else { + subscriber.putNext(nil) } }, error: { error in subscriber.putError(error) @@ -60,7 +62,7 @@ public func mapError(_ f: @escaping(E) -> R) -> (Signal) -> Signa } } -public func introduceError(_ type: E.Type) -> (Signal) -> Signal { +public func castError(_ type: E.Type) -> (Signal) -> Signal { return { signal in return Signal { subscriber in return signal.start(next: { next in diff --git a/SwiftSignalKit/Signal_Materialize.swift b/SwiftSignalKit/Signal_Materialize.swift index 92e7a9b..e0e8330 100644 --- a/SwiftSignalKit/Signal_Materialize.swift +++ b/SwiftSignalKit/Signal_Materialize.swift @@ -32,7 +32,6 @@ public func materialize(signal: Signal, NoError>) -> Sig subscriber.putCompletion() } }, error: { _ in - subscriber.putCompletion() }, completed: { subscriber.putCompletion() }) diff --git a/SwiftSignalKit/ThreadPool.swift b/SwiftSignalKit/ThreadPool.swift index b972888..b56f0c2 100644 --- a/SwiftSignalKit/ThreadPool.swift +++ b/SwiftSignalKit/ThreadPool.swift @@ -12,7 +12,7 @@ public final class ThreadPoolTask { self.action = action } - func execute() { + public func execute() { if !state.cancelled.with({ $0 }) { self.action(self.state) } From 55dc77bee385b1e2939f9e973e55fce6a3375736 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sat, 6 Nov 2021 20:37:40 +0800 Subject: [PATCH 3/9] Remove unused `SwiftSignalKit copy-Info.plist` --- SSignalKit.xcodeproj/project.pbxproj | 2 -- SwiftSignalKit copy-Info.plist | 26 ------------------- .../SwiftSignalKitFunctionsTests.swift | 4 +-- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 SwiftSignalKit copy-Info.plist diff --git a/SSignalKit.xcodeproj/project.pbxproj b/SSignalKit.xcodeproj/project.pbxproj index 94d162f..fd84d4c 100644 --- a/SSignalKit.xcodeproj/project.pbxproj +++ b/SSignalKit.xcodeproj/project.pbxproj @@ -246,7 +246,6 @@ D07A5CFC1BBDE6E400451791 /* Promise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Promise.swift; sourceTree = ""; }; D09FD73C1BA9BAB900FF0A4F /* SVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVariable.h; sourceTree = ""; }; D09FD73D1BA9BAB900FF0A4F /* SVariable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVariable.m; sourceTree = ""; }; - D0B417E71D7DFA40004562A4 /* SwiftSignalKit copy-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "SwiftSignalKit copy-Info.plist"; path = "/Users/peter/Documents/Telegram-iOS/submodules/SSignalKit/SwiftSignalKit copy-Info.plist"; sourceTree = ""; }; D0B417ED1D7DFA63004562A4 /* SwiftSignalKitMac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftSignalKitMac.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0B417EF1D7DFA63004562A4 /* SwiftSignalKitMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftSignalKitMac.h; sourceTree = ""; }; D0B417F01D7DFA63004562A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -368,7 +367,6 @@ D0085B301B282B9800EAF753 /* SwiftSignalKitTests */, D0B417EE1D7DFA63004562A4 /* SwiftSignalKitMac */, D0445DD91A7C2CA500267924 /* Products */, - D0B417E71D7DFA40004562A4 /* SwiftSignalKit copy-Info.plist */, ); sourceTree = ""; }; diff --git a/SwiftSignalKit copy-Info.plist b/SwiftSignalKit copy-Info.plist deleted file mode 100644 index d3de8ee..0000000 --- a/SwiftSignalKit copy-Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift b/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift index 4ca69fb..63276f5 100644 --- a/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift +++ b/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift @@ -73,7 +73,7 @@ class SwiftSignalKitFunctionsTests: XCTestCase { let disposable = signal.start(next: { [object] next in generated = true let _ = object?.description - }, completed: { [object] + }, completed: { [object] in completed = true let _ = object?.description }) @@ -117,7 +117,7 @@ class SwiftSignalKitFunctionsTests: XCTestCase { error = true let _ = object?.description }, - completed: { [object] + completed: { [object] in completed = true let _ = object?.description }) From 8cef5669ebdc2b1c6bf936b569de5a764024ef67 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sun, 7 Nov 2021 08:06:58 +0800 Subject: [PATCH 4/9] Support carthage --- ReadMe.md | 20 + SSignalKit.xcodeproj/project.pbxproj | 418 ++---------------- .../xcschemes/SSignalKit.xcscheme | 77 ++++ .../xcschemes/SwiftSignalKit.xcscheme | 77 ++++ SwiftSignalKitTests/PerformanceTests.swift | 5 + .../SwiftSignalKitBasicTests.swift | 5 + .../SwiftSignalKitFunctionsTests.swift | 5 + 7 files changed, 221 insertions(+), 386 deletions(-) create mode 100644 ReadMe.md create mode 100644 SSignalKit.xcodeproj/xcshareddata/xcschemes/SSignalKit.xcscheme create mode 100644 SSignalKit.xcodeproj/xcshareddata/xcschemes/SwiftSignalKit.xcscheme diff --git a/ReadMe.md b/ReadMe.md new file mode 100644 index 0000000..6145a95 --- /dev/null +++ b/ReadMe.md @@ -0,0 +1,20 @@ +# Signals + +An experimental Rx- and RAC-3.0-inspired FRP framework + +Support iOS, tvOS, macOS + +## Install with [Carthage](https://github.com/Carthage/Carthage) + +Edit Cartfile: + +``` +github "cntrump/Signals" "main" +``` + +Build xcframeworks: + +```bash +carthage update --use-xcframeworks +``` + diff --git a/SSignalKit.xcodeproj/project.pbxproj b/SSignalKit.xcodeproj/project.pbxproj index fd84d4c..706376f 100644 --- a/SSignalKit.xcodeproj/project.pbxproj +++ b/SSignalKit.xcodeproj/project.pbxproj @@ -89,9 +89,7 @@ D0445DE41A7C2CA500267924 /* SSignalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0445DD81A7C2CA500267924 /* SSignalKit.framework */; }; D0445E571A7C3FB400267924 /* SDisposableTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D0445E561A7C3FB400267924 /* SDisposableTests.m */; }; D0467D1820D7F7BC0055C28F /* Signal_Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0467D1720D7F7BC0055C28F /* Signal_Loop.swift */; }; - D0467D1920D7F7BC0055C28F /* Signal_Loop.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0467D1720D7F7BC0055C28F /* Signal_Loop.swift */; }; D053B4001F16881000E2D58A /* QueueLocalObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D053B3FF1F16881000E2D58A /* QueueLocalObject.swift */; }; - D053B4011F16881000E2D58A /* QueueLocalObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = D053B3FF1F16881000E2D58A /* QueueLocalObject.swift */; }; D05F09A81C9EF77100BB6F96 /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05F09A71C9EF77100BB6F96 /* Multicast.swift */; }; D066BD0A1C7FE06700D7A576 /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D066BD091C7FE06700D7A576 /* Lock.swift */; }; D06F106C1A85561E00485185 /* SSignalBasicTests.m in Sources */ = {isa = PBXBuildFile; fileRef = D06F106B1A85561E00485185 /* SSignalBasicTests.m */; }; @@ -100,31 +98,6 @@ D07A5CFD1BBDE6E400451791 /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07A5CFC1BBDE6E400451791 /* Promise.swift */; }; D09FD73E1BA9BAB900FF0A4F /* SVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = D09FD73C1BA9BAB900FF0A4F /* SVariable.h */; settings = {ATTRIBUTES = (Public, ); }; }; D09FD73F1BA9BAB900FF0A4F /* SVariable.m in Sources */ = {isa = PBXBuildFile; fileRef = D09FD73D1BA9BAB900FF0A4F /* SVariable.m */; }; - D0B417F11D7DFA63004562A4 /* SwiftSignalKitMac.h in Headers */ = {isa = PBXBuildFile; fileRef = D0B417EF1D7DFA63004562A4 /* SwiftSignalKitMac.h */; settings = {ATTRIBUTES = (Public, ); }; }; - D0B417F61D7DFAAB004562A4 /* Signal_Timing.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B3C1B282BEE00EAF753 /* Signal_Timing.swift */; }; - D0B417F71D7DFAAB004562A4 /* Signal_SideEffects.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B3D1B282BEE00EAF753 /* Signal_SideEffects.swift */; }; - D0B417F81D7DFAAB004562A4 /* Signal_Dispatch.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B3E1B282BEE00EAF753 /* Signal_Dispatch.swift */; }; - D0B417F91D7DFAAB004562A4 /* ThreadPool.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B3F1B282BEE00EAF753 /* ThreadPool.swift */; }; - D0B417FA1D7DFAAB004562A4 /* Timer.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B401B282BEE00EAF753 /* Timer.swift */; }; - D0B417FB1D7DFAAB004562A4 /* Queue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B411B282BEE00EAF753 /* Queue.swift */; }; - D0B417FC1D7DFAAB004562A4 /* ValuePipe.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B421B282BEE00EAF753 /* ValuePipe.swift */; }; - D0B417FD1D7DFAAB004562A4 /* Bag.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B431B282BEE00EAF753 /* Bag.swift */; }; - D0B417FE1D7DFAAB004562A4 /* Signal_Take.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B441B282BEE00EAF753 /* Signal_Take.swift */; }; - D0B417FF1D7DFAAB004562A4 /* Signal_Catch.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B451B282BEE00EAF753 /* Signal_Catch.swift */; }; - D0B418001D7DFAAB004562A4 /* Signal_Single.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B461B282BEE00EAF753 /* Signal_Single.swift */; }; - D0B418011D7DFAAB004562A4 /* Signal_Meta.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B471B282BEE00EAF753 /* Signal_Meta.swift */; }; - D0B418021D7DFAAB004562A4 /* Signal_Combine.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B481B282BEE00EAF753 /* Signal_Combine.swift */; }; - D0B418031D7DFAAB004562A4 /* Signal_Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FC1A391CA3284F0056AE9A /* Signal_Merge.swift */; }; - D0B418041D7DFAAB004562A4 /* Atomic.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B491B282BEE00EAF753 /* Atomic.swift */; }; - D0B418051D7DFAAB004562A4 /* Signal_Reduce.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B4A1B282BEE00EAF753 /* Signal_Reduce.swift */; }; - D0B418061D7DFAAB004562A4 /* Signal_Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0CD17B11CC17C83007C5650 /* Signal_Materialize.swift */; }; - D0B418071D7DFAAB004562A4 /* Signal.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B4B1B282BEE00EAF753 /* Signal.swift */; }; - D0B418081D7DFAAB004562A4 /* Disposable.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B4C1B282BEE00EAF753 /* Disposable.swift */; }; - D0B418091D7DFAAB004562A4 /* Signal_Mapping.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B4D1B282BEE00EAF753 /* Signal_Mapping.swift */; }; - D0B4180A1D7DFAAB004562A4 /* Subscriber.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0085B4E1B282BEE00EAF753 /* Subscriber.swift */; }; - D0B4180B1D7DFAAB004562A4 /* Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = D07A5CFC1BBDE6E400451791 /* Promise.swift */; }; - D0B4180C1D7DFAAB004562A4 /* Multicast.swift in Sources */ = {isa = PBXBuildFile; fileRef = D05F09A71C9EF77100BB6F96 /* Multicast.swift */; }; - D0B4180D1D7DFAAB004562A4 /* Lock.swift in Sources */ = {isa = PBXBuildFile; fileRef = D066BD091C7FE06700D7A576 /* Lock.swift */; }; D0CD17B21CC17C83007C5650 /* Signal_Materialize.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0CD17B11CC17C83007C5650 /* Signal_Materialize.swift */; }; D0FC1A3A1CA3284F0056AE9A /* Signal_Merge.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0FC1A391CA3284F0056AE9A /* Signal_Merge.swift */; }; /* End PBXBuildFile section */ @@ -246,7 +219,6 @@ D07A5CFC1BBDE6E400451791 /* Promise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Promise.swift; sourceTree = ""; }; D09FD73C1BA9BAB900FF0A4F /* SVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVariable.h; sourceTree = ""; }; D09FD73D1BA9BAB900FF0A4F /* SVariable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVariable.m; sourceTree = ""; }; - D0B417ED1D7DFA63004562A4 /* SwiftSignalKitMac.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftSignalKitMac.framework; sourceTree = BUILT_PRODUCTS_DIR; }; D0B417EF1D7DFA63004562A4 /* SwiftSignalKitMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftSignalKitMac.h; sourceTree = ""; }; D0B417F01D7DFA63004562A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; D0CD17B11CC17C83007C5650 /* Signal_Materialize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Signal_Materialize.swift; sourceTree = ""; }; @@ -284,13 +256,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D0B417E91D7DFA63004562A4 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -377,7 +342,6 @@ D0445DE31A7C2CA500267924 /* SSignalKitTests.xctest */, D0085B221B282B9800EAF753 /* SwiftSignalKit.framework */, D0085B2C1B282B9800EAF753 /* SwiftSignalKitTests.xctest */, - D0B417ED1D7DFA63004562A4 /* SwiftSignalKitMac.framework */, ); name = Products; sourceTree = ""; @@ -531,14 +495,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D0B417EA1D7DFA63004562A4 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - D0B417F11D7DFA63004562A4 /* SwiftSignalKitMac.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -614,24 +570,6 @@ productReference = D0445DE31A7C2CA500267924 /* SSignalKitTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - D0B417EC1D7DFA63004562A4 /* SwiftSignalKitMac */ = { - isa = PBXNativeTarget; - buildConfigurationList = D0B417F21D7DFA63004562A4 /* Build configuration list for PBXNativeTarget "SwiftSignalKitMac" */; - buildPhases = ( - D0B417E81D7DFA63004562A4 /* Sources */, - D0B417E91D7DFA63004562A4 /* Frameworks */, - D0B417EA1D7DFA63004562A4 /* Headers */, - D0B417EB1D7DFA63004562A4 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = SwiftSignalKitMac; - productName = SwiftSignalKitMac; - productReference = D0B417ED1D7DFA63004562A4 /* SwiftSignalKitMac.framework */; - productType = "com.apple.product-type.framework"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -657,10 +595,6 @@ D0445DE21A7C2CA500267924 = { CreatedOnToolsVersion = 6.1.1; }; - D0B417EC1D7DFA63004562A4 = { - CreatedOnToolsVersion = 8.0; - ProvisioningStyle = Manual; - }; }; }; buildConfigurationList = D0445DD21A7C2CA500267924 /* Build configuration list for PBXProject "SSignalKit" */; @@ -680,7 +614,6 @@ D0445DE21A7C2CA500267924 /* SSignalKitTests */, D0085B211B282B9800EAF753 /* SwiftSignalKit */, D0085B2B1B282B9800EAF753 /* SwiftSignalKitTests */, - D0B417EC1D7DFA63004562A4 /* SwiftSignalKitMac */, ); }; /* End PBXProject section */ @@ -714,13 +647,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D0B417EB1D7DFA63004562A4 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -813,39 +739,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - D0B417E81D7DFA63004562A4 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - D0B417F61D7DFAAB004562A4 /* Signal_Timing.swift in Sources */, - D0B417F71D7DFAAB004562A4 /* Signal_SideEffects.swift in Sources */, - D0B417F81D7DFAAB004562A4 /* Signal_Dispatch.swift in Sources */, - D0B417F91D7DFAAB004562A4 /* ThreadPool.swift in Sources */, - D0B417FA1D7DFAAB004562A4 /* Timer.swift in Sources */, - D0B417FB1D7DFAAB004562A4 /* Queue.swift in Sources */, - D0B417FC1D7DFAAB004562A4 /* ValuePipe.swift in Sources */, - D0B417FD1D7DFAAB004562A4 /* Bag.swift in Sources */, - D0B417FE1D7DFAAB004562A4 /* Signal_Take.swift in Sources */, - D0B417FF1D7DFAAB004562A4 /* Signal_Catch.swift in Sources */, - D0B418001D7DFAAB004562A4 /* Signal_Single.swift in Sources */, - D0B418011D7DFAAB004562A4 /* Signal_Meta.swift in Sources */, - D0B418021D7DFAAB004562A4 /* Signal_Combine.swift in Sources */, - D0B418031D7DFAAB004562A4 /* Signal_Merge.swift in Sources */, - D0B418041D7DFAAB004562A4 /* Atomic.swift in Sources */, - D0B418051D7DFAAB004562A4 /* Signal_Reduce.swift in Sources */, - D0B418061D7DFAAB004562A4 /* Signal_Materialize.swift in Sources */, - D0B418071D7DFAAB004562A4 /* Signal.swift in Sources */, - D0B418081D7DFAAB004562A4 /* Disposable.swift in Sources */, - D0467D1920D7F7BC0055C28F /* Signal_Loop.swift in Sources */, - D0B418091D7DFAAB004562A4 /* Signal_Mapping.swift in Sources */, - D053B4011F16881000E2D58A /* QueueLocalObject.swift in Sources */, - D0B4180A1D7DFAAB004562A4 /* Subscriber.swift in Sources */, - D0B4180B1D7DFAAB004562A4 /* Promise.swift in Sources */, - D0B4180C1D7DFAAB004562A4 /* Multicast.swift in Sources */, - D0B4180D1D7DFAAB004562A4 /* Lock.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -866,7 +759,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -883,12 +775,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -898,7 +790,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; @@ -912,12 +803,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -1015,9 +906,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1074,7 +966,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1091,12 +982,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -1122,35 +1013,6 @@ }; name = DebugFork; }; - D021D507219CB1D90064BEBA /* DebugFork */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = DebugFork; - }; D0445DEC1A7C2CA500267924 /* DebugHockeyapp */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1205,9 +1067,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1259,10 +1122,11 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1404,10 +1268,11 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1460,7 +1325,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; @@ -1474,12 +1338,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -1548,10 +1412,11 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1604,7 +1469,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; @@ -1618,12 +1482,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -1647,35 +1511,6 @@ }; name = ReleaseHockeyappInternal; }; - D0924FE71FE52C0A003F693F /* ReleaseHockeyappInternal */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - }; - name = ReleaseHockeyappInternal; - }; D0ADF92E212B3AD400310BBC /* DebugAppStoreLLC */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1730,9 +1565,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -1789,7 +1625,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -1806,12 +1641,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -1837,122 +1672,6 @@ }; name = DebugAppStoreLLC; }; - D0ADF933212B3AD400310BBC /* DebugAppStoreLLC */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = DebugAppStoreLLC; - }; - D0B417F31D7DFA63004562A4 /* DebugHockeyapp */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - }; - name = DebugHockeyapp; - }; - D0B417F41D7DFA63004562A4 /* ReleaseHockeyapp */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - }; - name = ReleaseHockeyapp; - }; - D0B417F51D7DFA63004562A4 /* ReleaseAppStore */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - }; - name = ReleaseAppStore; - }; D0CE6EEF213DC30100BCD44B /* ReleaseAppStoreLLC */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1999,10 +1718,11 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = NO; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -2055,7 +1775,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; @@ -2069,12 +1788,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -2097,35 +1816,6 @@ }; name = ReleaseAppStoreLLC; }; - D0CE6EF4213DC30100BCD44B /* ReleaseAppStoreLLC */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - }; - name = ReleaseAppStoreLLC; - }; D0DB57B61E5C4B7A0071854C /* DebugAppStore */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2180,9 +1870,10 @@ MACOSX_DEPLOYMENT_TARGET = 10.10; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = "macosx iphoneos iphonesimulator appletvos appletvsimulator"; SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; + TARGETED_DEVICE_FAMILY = "1,2,3,6"; + TVOS_DEPLOYMENT_TARGET = 9.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -2239,7 +1930,6 @@ isa = XCBuildConfiguration; buildSettings = { APPLICATION_EXTENSION_API_ONLY = YES; - ARCHS = "$(ARCHS_STANDARD)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; CODE_SIGN_STYLE = Manual; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -2256,12 +1946,12 @@ INFOPLIST_FILE = SwiftSignalKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; OTHER_SWIFT_FLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "org.telegram.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_REFLECTION_METADATA_LEVEL = none; }; @@ -2287,35 +1977,6 @@ }; name = DebugAppStore; }; - D0DB57BB1E5C4B7A0071854C /* DebugAppStore */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_SUSPICIOUS_MOVES = YES; - CODE_SIGN_IDENTITY = "-"; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_VERSION = A; - INFOPLIST_FILE = SwiftSignalKitMac/Info.plist; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = org.telegram.Telegram.SwiftSignalKitMac; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - }; - name = DebugAppStore; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -2394,21 +2055,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = ReleaseHockeyapp; }; - D0B417F21D7DFA63004562A4 /* Build configuration list for PBXNativeTarget "SwiftSignalKitMac" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - D0B417F31D7DFA63004562A4 /* DebugHockeyapp */, - D021D507219CB1D90064BEBA /* DebugFork */, - D0DB57BB1E5C4B7A0071854C /* DebugAppStore */, - D0ADF933212B3AD400310BBC /* DebugAppStoreLLC */, - D0B417F41D7DFA63004562A4 /* ReleaseHockeyapp */, - D0924FE71FE52C0A003F693F /* ReleaseHockeyappInternal */, - D0B417F51D7DFA63004562A4 /* ReleaseAppStore */, - D0CE6EF4213DC30100BCD44B /* ReleaseAppStoreLLC */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = ReleaseHockeyapp; - }; /* End XCConfigurationList section */ }; rootObject = D0445DCF1A7C2CA500267924 /* Project object */; diff --git a/SSignalKit.xcodeproj/xcshareddata/xcschemes/SSignalKit.xcscheme b/SSignalKit.xcodeproj/xcshareddata/xcschemes/SSignalKit.xcscheme new file mode 100644 index 0000000..bf66f5f --- /dev/null +++ b/SSignalKit.xcodeproj/xcshareddata/xcschemes/SSignalKit.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SSignalKit.xcodeproj/xcshareddata/xcschemes/SwiftSignalKit.xcscheme b/SSignalKit.xcodeproj/xcshareddata/xcschemes/SwiftSignalKit.xcscheme new file mode 100644 index 0000000..bb72090 --- /dev/null +++ b/SSignalKit.xcodeproj/xcshareddata/xcschemes/SwiftSignalKit.xcscheme @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SwiftSignalKitTests/PerformanceTests.swift b/SwiftSignalKitTests/PerformanceTests.swift index 313d02a..5fd7bdf 100644 --- a/SwiftSignalKitTests/PerformanceTests.swift +++ b/SwiftSignalKitTests/PerformanceTests.swift @@ -1,4 +1,9 @@ +#if os(macOS) +import AppKit +#else import UIKit +#endif + import XCTest import SwiftSignalKit import Foundation diff --git a/SwiftSignalKitTests/SwiftSignalKitBasicTests.swift b/SwiftSignalKitTests/SwiftSignalKitBasicTests.swift index 210a969..22b5007 100644 --- a/SwiftSignalKitTests/SwiftSignalKitBasicTests.swift +++ b/SwiftSignalKitTests/SwiftSignalKitBasicTests.swift @@ -1,4 +1,9 @@ +#if os(macOS) +import AppKit +#else import UIKit +#endif + import XCTest import SwiftSignalKit diff --git a/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift b/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift index 63276f5..3692223 100644 --- a/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift +++ b/SwiftSignalKitTests/SwiftSignalKitFunctionsTests.swift @@ -1,4 +1,9 @@ +#if os(macOS) +import AppKit +#else import UIKit +#endif + import XCTest import SwiftSignalKit From 9f5a07ff3afd5765f48d9fda6dad6d87a954e5fa Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sun, 7 Nov 2021 08:16:16 +0800 Subject: [PATCH 5/9] Add NS_ASSUME_NONNULL macro --- SSignalKit.xcodeproj/project.pbxproj | 12 ------------ SSignalKit/SAtomic.h | 4 ++++ SSignalKit/SBag.h | 4 ++++ SSignalKit/SBlockDisposable.h | 4 ++++ SSignalKit/SDisposable.h | 4 ++++ SSignalKit/SDisposableSet.h | 4 ++++ SSignalKit/SMetaDisposable.h | 4 ++++ SSignalKit/SMulticastSignalManager.h | 4 ++++ SSignalKit/SQueue.h | 4 ++++ SSignalKit/SQueueLocalObject.h | 2 +- SSignalKit/SSignal+Accumulate.h | 4 ++++ SSignalKit/SSignal+Catch.h | 4 ++++ SSignalKit/SSignal+Combine.h | 4 ++++ SSignalKit/SSignal+Dispatch.h | 5 ++++- SSignalKit/SSignal+Mapping.h | 4 ++++ SSignalKit/SSignal+Meta.h | 4 ++++ SSignalKit/SSignal+Multicast.h | 4 ++++ SSignalKit/SSignal+Pipe.h | 3 +++ SSignalKit/SSignal+SideEffects.h | 4 ++++ SSignalKit/SSignal+Single.h | 4 ++++ SSignalKit/SSignal+Take.h | 4 ++++ SSignalKit/SSignal+Timing.h | 5 ++++- SSignalKit/SSignal.h | 3 +++ SSignalKit/SSubscriber.h | 4 ++++ SSignalKit/SThreadPool.h | 4 ++++ SSignalKit/SThreadPoolQueue.h | 4 ++++ SSignalKit/SThreadPoolTask.h | 4 ++++ SSignalKit/STimer.h | 4 ++++ SSignalKit/SVariable.h | 4 ++++ SwiftSignalKitMac/Info.plist | 26 -------------------------- SwiftSignalKitMac/SwiftSignalKitMac.h | 19 ------------------- 31 files changed, 107 insertions(+), 60 deletions(-) delete mode 100644 SwiftSignalKitMac/Info.plist delete mode 100644 SwiftSignalKitMac/SwiftSignalKitMac.h diff --git a/SSignalKit.xcodeproj/project.pbxproj b/SSignalKit.xcodeproj/project.pbxproj index 706376f..7a997fa 100644 --- a/SSignalKit.xcodeproj/project.pbxproj +++ b/SSignalKit.xcodeproj/project.pbxproj @@ -219,8 +219,6 @@ D07A5CFC1BBDE6E400451791 /* Promise.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Promise.swift; sourceTree = ""; }; D09FD73C1BA9BAB900FF0A4F /* SVariable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVariable.h; sourceTree = ""; }; D09FD73D1BA9BAB900FF0A4F /* SVariable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SVariable.m; sourceTree = ""; }; - D0B417EF1D7DFA63004562A4 /* SwiftSignalKitMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftSignalKitMac.h; sourceTree = ""; }; - D0B417F01D7DFA63004562A4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; D0CD17B11CC17C83007C5650 /* Signal_Materialize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Signal_Materialize.swift; sourceTree = ""; }; D0FC1A391CA3284F0056AE9A /* Signal_Merge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Signal_Merge.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -330,7 +328,6 @@ D0445DE71A7C2CA500267924 /* SSignalKitTests */, D0085B231B282B9800EAF753 /* SwiftSignalKit */, D0085B301B282B9800EAF753 /* SwiftSignalKitTests */, - D0B417EE1D7DFA63004562A4 /* SwiftSignalKitMac */, D0445DD91A7C2CA500267924 /* Products */, ); sourceTree = ""; @@ -439,15 +436,6 @@ name = "Supporting Files"; sourceTree = ""; }; - D0B417EE1D7DFA63004562A4 /* SwiftSignalKitMac */ = { - isa = PBXGroup; - children = ( - D0B417EF1D7DFA63004562A4 /* SwiftSignalKitMac.h */, - D0B417F01D7DFA63004562A4 /* Info.plist */, - ); - path = SwiftSignalKitMac; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ diff --git a/SSignalKit/SAtomic.h b/SSignalKit/SAtomic.h index 3e29f89..0c577d2 100644 --- a/SSignalKit/SAtomic.h +++ b/SSignalKit/SAtomic.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SAtomic : NSObject - (instancetype _Nonnull)initWithValue:(id _Nullable)value; @@ -10,3 +12,5 @@ - (id _Nullable)with:(id _Nullable (^ _Nonnull)(id _Nullable))f; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SBag.h b/SSignalKit/SBag.h index 6d9ca7a..d347470 100644 --- a/SSignalKit/SBag.h +++ b/SSignalKit/SBag.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SBag : NSObject - (NSInteger)addItem:(id _Nonnull)item; @@ -9,3 +11,5 @@ - (NSArray * _Nonnull)copyItems; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SBlockDisposable.h b/SSignalKit/SBlockDisposable.h index ff101df..4a86b07 100644 --- a/SSignalKit/SBlockDisposable.h +++ b/SSignalKit/SBlockDisposable.h @@ -1,7 +1,11 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SBlockDisposable : NSObject - (instancetype _Nonnull)initWithBlock:(void (^ _Nullable)(void))block; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SDisposable.h b/SSignalKit/SDisposable.h index 49d9762..6ef7189 100644 --- a/SSignalKit/SDisposable.h +++ b/SSignalKit/SDisposable.h @@ -1,7 +1,11 @@ #import +NS_ASSUME_NONNULL_BEGIN + @protocol SDisposable - (void)dispose; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SDisposableSet.h b/SSignalKit/SDisposableSet.h index e7ec5b4..d090a4d 100644 --- a/SSignalKit/SDisposableSet.h +++ b/SSignalKit/SDisposableSet.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class SSignal; @interface SDisposableSet : NSObject @@ -8,3 +10,5 @@ - (void)remove:(id _Nonnull)disposable; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SMetaDisposable.h b/SSignalKit/SMetaDisposable.h index e22e797..b2bc07b 100644 --- a/SSignalKit/SMetaDisposable.h +++ b/SSignalKit/SMetaDisposable.h @@ -1,7 +1,11 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SMetaDisposable : NSObject - (void)setDisposable:(id _Nullable)disposable; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SMulticastSignalManager.h b/SSignalKit/SMulticastSignalManager.h index 449deb8..44d06d3 100644 --- a/SSignalKit/SMulticastSignalManager.h +++ b/SSignalKit/SMulticastSignalManager.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SMulticastSignalManager : NSObject - (SSignal * _Nonnull)multicastedSignalForKey:(NSString * _Nonnull)key producer:(SSignal * _Nonnull (^ _Nonnull)(void))producer; @@ -9,3 +11,5 @@ - (void)putNext:(id _Nullable)next toMulticastedPipeForKey:(NSString * _Nonnull)key; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SQueue.h b/SSignalKit/SQueue.h index 9f45afd..90c30fd 100644 --- a/SSignalKit/SQueue.h +++ b/SSignalKit/SQueue.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SQueue : NSObject + (SQueue * _Nonnull)mainQueue; @@ -17,3 +19,5 @@ - (bool)isCurrentQueue; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SQueueLocalObject.h b/SSignalKit/SQueueLocalObject.h index 85fdfd2..87fcb56 100644 --- a/SSignalKit/SQueueLocalObject.h +++ b/SSignalKit/SQueueLocalObject.h @@ -8,6 +8,7 @@ #import #import + NS_ASSUME_NONNULL_BEGIN @interface SQueueLocalObject : NSObject @@ -16,4 +17,3 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - diff --git a/SSignalKit/SSignal+Accumulate.h b/SSignalKit/SSignal+Accumulate.h index 8c17743..37e25ad 100644 --- a/SSignalKit/SSignal+Accumulate.h +++ b/SSignalKit/SSignal+Accumulate.h @@ -1,8 +1,12 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Accumulate) - (SSignal * _Nonnull)reduceLeft:(id _Nullable)value with:(id _Nullable (^ _Nonnull)(id _Nullable, id _Nullable))f; - (SSignal * _Nonnull)reduceLeftWithPassthrough:(id _Nullable)value with:(id _Nullable (^ _Nonnull)(id _Nullable, id _Nullable, void (^ _Nonnull)(id _Nullable)))f; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Catch.h b/SSignalKit/SSignal+Catch.h index 43e8029..0a067da 100644 --- a/SSignalKit/SSignal+Catch.h +++ b/SSignalKit/SSignal+Catch.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Catch) - (SSignal * _Nonnull)catch:(SSignal * _Nonnull (^ _Nonnull )(id _Nullable error))f; @@ -7,3 +9,5 @@ - (SSignal * _Nonnull)retryIf:(bool (^ _Nonnull)(id _Nullable error))predicate; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Combine.h b/SSignalKit/SSignal+Combine.h index 2038e06..79fca4f 100644 --- a/SSignalKit/SSignal+Combine.h +++ b/SSignalKit/SSignal+Combine.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Combine) + (SSignal * _Nonnull)combineSignals:(NSArray * _Nonnull)signals; @@ -8,3 +10,5 @@ + (SSignal * _Nonnull)mergeSignals:(NSArray * _Nonnull)signals; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Dispatch.h b/SSignalKit/SSignal+Dispatch.h index 21d0bfb..de2c647 100644 --- a/SSignalKit/SSignal+Dispatch.h +++ b/SSignalKit/SSignal+Dispatch.h @@ -1,8 +1,9 @@ #import - #import #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Dispatch) - (SSignal * _Nonnull)deliverOn:(SQueue * _Nonnull)queue; @@ -12,3 +13,5 @@ - (SSignal * _Nonnull)throttleOn:(SQueue * _Nonnull)queue delay:(NSTimeInterval)delay; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Mapping.h b/SSignalKit/SSignal+Mapping.h index 75fb909..debbfb3 100644 --- a/SSignalKit/SSignal+Mapping.h +++ b/SSignalKit/SSignal+Mapping.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Mapping) - (SSignal * _Nonnull)map:(id _Nullable (^ _Nonnull)(id _Nullable))f; @@ -7,3 +9,5 @@ - (SSignal * _Nonnull)ignoreRepeated; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Meta.h b/SSignalKit/SSignal+Meta.h index caa4c3a..4c897ee 100644 --- a/SSignalKit/SSignal+Meta.h +++ b/SSignalKit/SSignal+Meta.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class SQueue; @interface SSignal (Meta) @@ -20,3 +22,5 @@ - (SSignal * _Nonnull)enqueue:(SSignal * _Nonnull)signal; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Multicast.h b/SSignalKit/SSignal+Multicast.h index 817f3a7..889e05c 100644 --- a/SSignalKit/SSignal+Multicast.h +++ b/SSignalKit/SSignal+Multicast.h @@ -1,7 +1,11 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Multicast) - (SSignal * _Nonnull)multicast; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Pipe.h b/SSignalKit/SSignal+Pipe.h index ac09fde..15d14cd 100644 --- a/SSignalKit/SSignal+Pipe.h +++ b/SSignalKit/SSignal+Pipe.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SPipe : NSObject @property (nonatomic, copy, readonly) SSignal * _Nonnull (^ _Nonnull signalProducer)(void); @@ -9,3 +11,4 @@ @end +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+SideEffects.h b/SSignalKit/SSignal+SideEffects.h index 787661e..cbba146 100644 --- a/SSignalKit/SSignal+SideEffects.h +++ b/SSignalKit/SSignal+SideEffects.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (SideEffects) - (SSignal * _Nonnull)onStart:(void (^ _Nonnull)(void))f; @@ -11,3 +13,5 @@ - (SSignal * _Nonnull)onDispose:(void (^ _Nonnull)(void))f; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Single.h b/SSignalKit/SSignal+Single.h index 46693c0..fccec2c 100644 --- a/SSignalKit/SSignal+Single.h +++ b/SSignalKit/SSignal+Single.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Single) + (SSignal * _Nonnull)single:(id _Nullable)next; @@ -8,3 +10,5 @@ + (SSignal * _Nonnull)complete; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Take.h b/SSignalKit/SSignal+Take.h index 9128e4a..9ed8d57 100644 --- a/SSignalKit/SSignal+Take.h +++ b/SSignalKit/SSignal+Take.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Take) - (SSignal * _Nonnull)take:(NSUInteger)count; @@ -7,3 +9,5 @@ - (SSignal * _Nonnull)takeUntilReplacement:(SSignal * _Nonnull)replacement; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal+Timing.h b/SSignalKit/SSignal+Timing.h index ae4c7d4..d4c4b5f 100644 --- a/SSignalKit/SSignal+Timing.h +++ b/SSignalKit/SSignal+Timing.h @@ -1,7 +1,8 @@ #import - #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal (Timing) - (SSignal * _Nonnull)delay:(NSTimeInterval)seconds onQueue:(SQueue * _Nonnull)queue; @@ -9,3 +10,5 @@ - (SSignal * _Nonnull)wait:(NSTimeInterval)seconds; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSignal.h b/SSignalKit/SSignal.h index c3d304b..a5aad36 100644 --- a/SSignalKit/SSignal.h +++ b/SSignalKit/SSignal.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSignal : NSObject { @public @@ -16,3 +18,4 @@ @end +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SSubscriber.h b/SSignalKit/SSubscriber.h index 12547bc..7517495 100644 --- a/SSignalKit/SSubscriber.h +++ b/SSignalKit/SSubscriber.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SSubscriber : NSObject { } @@ -20,3 +22,5 @@ - (instancetype _Nonnull)initWithName:(NSString * _Nonnull)name next:(void (^ _Nullable)(id _Nullable))next error:(void (^ _Nullable)(id _Nullable))error completed:(void (^ _Nullable)(void))completed; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SThreadPool.h b/SSignalKit/SThreadPool.h index b249a1f..c0a3925 100644 --- a/SSignalKit/SThreadPool.h +++ b/SSignalKit/SThreadPool.h @@ -3,6 +3,8 @@ #import #import +NS_ASSUME_NONNULL_BEGIN + @interface SThreadPool : NSObject - (instancetype _Nonnull)initWithThreadCount:(NSUInteger)threadCount threadPriority:(double)threadPriority; @@ -13,3 +15,5 @@ - (void)_workOnQueue:(SThreadPoolQueue * _Nonnull)queue block:(void (^ _Nonnull)(void))block; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SThreadPoolQueue.h b/SSignalKit/SThreadPoolQueue.h index 51d6300..cb7ef86 100644 --- a/SSignalKit/SThreadPoolQueue.h +++ b/SSignalKit/SThreadPoolQueue.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class SThreadPool; @class SThreadPoolTask; @@ -11,3 +13,5 @@ - (bool)_hasTasks; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SThreadPoolTask.h b/SSignalKit/SThreadPoolTask.h index 2f3b100..f68a4d7 100644 --- a/SSignalKit/SThreadPoolTask.h +++ b/SSignalKit/SThreadPoolTask.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @interface SThreadPoolTask : NSObject - (instancetype _Nonnull)initWithBlock:(void (^ _Nonnull)(bool (^ _Nonnull)(void)))block; @@ -7,3 +9,5 @@ - (void)cancel; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/STimer.h b/SSignalKit/STimer.h index 0ad33b4..0b30ab5 100644 --- a/SSignalKit/STimer.h +++ b/SSignalKit/STimer.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class SQueue; @interface STimer : NSObject @@ -12,3 +14,5 @@ - (void)fireAndInvalidate; @end + +NS_ASSUME_NONNULL_END diff --git a/SSignalKit/SVariable.h b/SSignalKit/SVariable.h index ffd3fe7..ea98f11 100644 --- a/SSignalKit/SVariable.h +++ b/SSignalKit/SVariable.h @@ -1,5 +1,7 @@ #import +NS_ASSUME_NONNULL_BEGIN + @class SSignal; @interface SVariable : NSObject @@ -10,3 +12,5 @@ - (SSignal * _Nonnull)signal; @end + +NS_ASSUME_NONNULL_END diff --git a/SwiftSignalKitMac/Info.plist b/SwiftSignalKitMac/Info.plist deleted file mode 100644 index ab41b55..0000000 --- a/SwiftSignalKitMac/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSHumanReadableCopyright - Copyright © 2016 Telegram. All rights reserved. - NSPrincipalClass - - - diff --git a/SwiftSignalKitMac/SwiftSignalKitMac.h b/SwiftSignalKitMac/SwiftSignalKitMac.h deleted file mode 100644 index eef45f9..0000000 --- a/SwiftSignalKitMac/SwiftSignalKitMac.h +++ /dev/null @@ -1,19 +0,0 @@ -// -// SwiftSignalKitMac.h -// SwiftSignalKitMac -// -// Created by Peter on 9/5/16. -// Copyright © 2016 Telegram. All rights reserved. -// - -#import - -//! Project version number for SwiftSignalKitMac. -FOUNDATION_EXPORT double SwiftSignalKitMacVersionNumber; - -//! Project version string for SwiftSignalKitMac. -FOUNDATION_EXPORT const unsigned char SwiftSignalKitMacVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - From 3d8d84c92f75a7ce650d943ece32564420e7530c Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sun, 7 Nov 2021 08:19:15 +0800 Subject: [PATCH 6/9] Remove unnessasery _Nonnull --- SSignalKit/SAtomic.h | 8 ++++---- SSignalKit/SBag.h | 6 +++--- SSignalKit/SBlockDisposable.h | 2 +- SSignalKit/SDisposableSet.h | 4 ++-- SSignalKit/SMulticastSignalManager.h | 8 ++++---- SSignalKit/SQueue.h | 16 ++++++++-------- SSignalKit/SQueueLocalObject.m | 2 +- SSignalKit/SSignal+Accumulate.h | 4 ++-- SSignalKit/SSignal+Catch.h | 6 +++--- SSignalKit/SSignal+Combine.h | 6 +++--- SSignalKit/SSignal+Dispatch.h | 10 +++++----- SSignalKit/SSignal+Mapping.h | 6 +++--- SSignalKit/SSignal+Meta.h | 18 +++++++++--------- SSignalKit/SSignal+Multicast.h | 2 +- SSignalKit/SSignal+Pipe.h | 6 +++--- SSignalKit/SSignal+SideEffects.h | 14 +++++++------- SSignalKit/SSignal+Single.h | 8 ++++---- SSignalKit/SSignal+Take.h | 6 +++--- SSignalKit/SSignal+Timing.h | 6 +++--- SSignalKit/SSignal.h | 6 +++--- SSignalKit/SSubscriber.h | 4 ++-- SSignalKit/SThreadPool.h | 8 ++++---- SSignalKit/SThreadPoolQueue.h | 4 ++-- SSignalKit/SThreadPoolTask.h | 2 +- SSignalKit/STimer.h | 4 ++-- SSignalKit/SVariable.h | 6 +++--- 26 files changed, 86 insertions(+), 86 deletions(-) diff --git a/SSignalKit/SAtomic.h b/SSignalKit/SAtomic.h index 0c577d2..77def05 100644 --- a/SSignalKit/SAtomic.h +++ b/SSignalKit/SAtomic.h @@ -4,12 +4,12 @@ NS_ASSUME_NONNULL_BEGIN @interface SAtomic : NSObject -- (instancetype _Nonnull)initWithValue:(id _Nullable)value; -- (instancetype _Nonnull)initWithValue:(id _Nullable)value recursive:(bool)recursive; +- (instancetype)initWithValue:(id _Nullable)value; +- (instancetype)initWithValue:(id _Nullable)value recursive:(bool)recursive; - (id _Nullable)swap:(id _Nullable)newValue; - (id _Nullable)value; -- (id _Nullable)modify:(id _Nullable (^ _Nonnull)(id _Nullable))f; -- (id _Nullable)with:(id _Nullable (^ _Nonnull)(id _Nullable))f; +- (id _Nullable)modify:(id _Nullable (^)(id _Nullable))f; +- (id _Nullable)with:(id _Nullable (^)(id _Nullable))f; @end diff --git a/SSignalKit/SBag.h b/SSignalKit/SBag.h index d347470..df5d819 100644 --- a/SSignalKit/SBag.h +++ b/SSignalKit/SBag.h @@ -4,11 +4,11 @@ NS_ASSUME_NONNULL_BEGIN @interface SBag : NSObject -- (NSInteger)addItem:(id _Nonnull)item; -- (void)enumerateItems:(void (^ _Nonnull)(id _Nonnull))block; +- (NSInteger)addItem:(id)item; +- (void)enumerateItems:(void (^)(id))block; - (void)removeItem:(NSInteger)key; - (bool)isEmpty; -- (NSArray * _Nonnull)copyItems; +- (NSArray *)copyItems; @end diff --git a/SSignalKit/SBlockDisposable.h b/SSignalKit/SBlockDisposable.h index 4a86b07..92b42e9 100644 --- a/SSignalKit/SBlockDisposable.h +++ b/SSignalKit/SBlockDisposable.h @@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SBlockDisposable : NSObject -- (instancetype _Nonnull)initWithBlock:(void (^ _Nullable)(void))block; +- (instancetype)initWithBlock:(void (^ _Nullable)(void))block; @end diff --git a/SSignalKit/SDisposableSet.h b/SSignalKit/SDisposableSet.h index d090a4d..e28f194 100644 --- a/SSignalKit/SDisposableSet.h +++ b/SSignalKit/SDisposableSet.h @@ -6,8 +6,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SDisposableSet : NSObject -- (void)add:(id _Nonnull)disposable; -- (void)remove:(id _Nonnull)disposable; +- (void)add:(id)disposable; +- (void)remove:(id)disposable; @end diff --git a/SSignalKit/SMulticastSignalManager.h b/SSignalKit/SMulticastSignalManager.h index 44d06d3..349f688 100644 --- a/SSignalKit/SMulticastSignalManager.h +++ b/SSignalKit/SMulticastSignalManager.h @@ -4,11 +4,11 @@ NS_ASSUME_NONNULL_BEGIN @interface SMulticastSignalManager : NSObject -- (SSignal * _Nonnull)multicastedSignalForKey:(NSString * _Nonnull)key producer:(SSignal * _Nonnull (^ _Nonnull)(void))producer; -- (void)startStandaloneSignalIfNotRunningForKey:(NSString * _Nonnull)key producer:(SSignal * _Nonnull (^ _Nonnull)(void))producer; +- (SSignal *)multicastedSignalForKey:(NSString *)key producer:(SSignal * (^)(void))producer; +- (void)startStandaloneSignalIfNotRunningForKey:(NSString *)key producer:(SSignal * (^)(void))producer; -- (SSignal * _Nonnull)multicastedPipeForKey:(NSString * _Nonnull)key; -- (void)putNext:(id _Nullable)next toMulticastedPipeForKey:(NSString * _Nonnull)key; +- (SSignal *)multicastedPipeForKey:(NSString *)key; +- (void)putNext:(id _Nullable)next toMulticastedPipeForKey:(NSString *)key; @end diff --git a/SSignalKit/SQueue.h b/SSignalKit/SQueue.h index 90c30fd..a861878 100644 --- a/SSignalKit/SQueue.h +++ b/SSignalKit/SQueue.h @@ -4,17 +4,17 @@ NS_ASSUME_NONNULL_BEGIN @interface SQueue : NSObject -+ (SQueue * _Nonnull)mainQueue; -+ (SQueue * _Nonnull)concurrentDefaultQueue; -+ (SQueue * _Nonnull)concurrentBackgroundQueue; ++ (SQueue *)mainQueue; ++ (SQueue *)concurrentDefaultQueue; ++ (SQueue *)concurrentBackgroundQueue; -+ (SQueue * _Nonnull)wrapConcurrentNativeQueue:(dispatch_queue_t _Nonnull)nativeQueue; ++ (SQueue *)wrapConcurrentNativeQueue:(dispatch_queue_t)nativeQueue; -- (void)dispatch:(dispatch_block_t _Nonnull)block; -- (void)dispatchSync:(dispatch_block_t _Nonnull)block; -- (void)dispatch:(dispatch_block_t _Nonnull)block synchronous:(bool)synchronous; +- (void)dispatch:(dispatch_block_t)block; +- (void)dispatchSync:(dispatch_block_t)block; +- (void)dispatch:(dispatch_block_t)block synchronous:(bool)synchronous; -- (dispatch_queue_t _Nonnull)_dispatch_queue; +- (dispatch_queue_t)_dispatch_queue; - (bool)isCurrentQueue; diff --git a/SSignalKit/SQueueLocalObject.m b/SSignalKit/SQueueLocalObject.m index 0b12201..a42726b 100644 --- a/SSignalKit/SQueueLocalObject.m +++ b/SSignalKit/SQueueLocalObject.m @@ -12,7 +12,7 @@ @implementation SQueueLocalObject { SQueue *_queue; id valueRef; } --(id)initWithQueue:(SQueue *)queue generate:(id _Nonnull (^)(void))next { +-(id)initWithQueue:(SQueue *)queue generate:(id (^)(void))next { if (self = [super init]) { self->_queue = queue; [queue dispatch:^{ diff --git a/SSignalKit/SSignal+Accumulate.h b/SSignalKit/SSignal+Accumulate.h index 37e25ad..35bf3ca 100644 --- a/SSignalKit/SSignal+Accumulate.h +++ b/SSignalKit/SSignal+Accumulate.h @@ -4,8 +4,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Accumulate) -- (SSignal * _Nonnull)reduceLeft:(id _Nullable)value with:(id _Nullable (^ _Nonnull)(id _Nullable, id _Nullable))f; -- (SSignal * _Nonnull)reduceLeftWithPassthrough:(id _Nullable)value with:(id _Nullable (^ _Nonnull)(id _Nullable, id _Nullable, void (^ _Nonnull)(id _Nullable)))f; +- (SSignal *)reduceLeft:(id _Nullable)value with:(id _Nullable (^)(id _Nullable, id _Nullable))f; +- (SSignal *)reduceLeftWithPassthrough:(id _Nullable)value with:(id _Nullable (^)(id _Nullable, id _Nullable, void (^)(id _Nullable)))f; @end diff --git a/SSignalKit/SSignal+Catch.h b/SSignalKit/SSignal+Catch.h index 0a067da..3191ac8 100644 --- a/SSignalKit/SSignal+Catch.h +++ b/SSignalKit/SSignal+Catch.h @@ -4,9 +4,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Catch) -- (SSignal * _Nonnull)catch:(SSignal * _Nonnull (^ _Nonnull )(id _Nullable error))f; -- (SSignal * _Nonnull)restart; -- (SSignal * _Nonnull)retryIf:(bool (^ _Nonnull)(id _Nullable error))predicate; +- (SSignal *)catch:(SSignal * (^ )(id _Nullable error))f; +- (SSignal *)restart; +- (SSignal *)retryIf:(bool (^)(id _Nullable error))predicate; @end diff --git a/SSignalKit/SSignal+Combine.h b/SSignalKit/SSignal+Combine.h index 79fca4f..b7911cb 100644 --- a/SSignalKit/SSignal+Combine.h +++ b/SSignalKit/SSignal+Combine.h @@ -4,10 +4,10 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Combine) -+ (SSignal * _Nonnull)combineSignals:(NSArray * _Nonnull)signals; -+ (SSignal * _Nonnull)combineSignals:(NSArray * _Nonnull)signals withInitialStates:(NSArray * _Nullable)initialStates; ++ (SSignal *)combineSignals:(NSArray *)signals; ++ (SSignal *)combineSignals:(NSArray *)signals withInitialStates:(NSArray * _Nullable)initialStates; -+ (SSignal * _Nonnull)mergeSignals:(NSArray * _Nonnull)signals; ++ (SSignal *)mergeSignals:(NSArray *)signals; @end diff --git a/SSignalKit/SSignal+Dispatch.h b/SSignalKit/SSignal+Dispatch.h index de2c647..ca4b991 100644 --- a/SSignalKit/SSignal+Dispatch.h +++ b/SSignalKit/SSignal+Dispatch.h @@ -6,11 +6,11 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Dispatch) -- (SSignal * _Nonnull)deliverOn:(SQueue * _Nonnull)queue; -- (SSignal * _Nonnull)deliverOnThreadPool:(SThreadPool * _Nonnull)threadPool; -- (SSignal * _Nonnull)startOn:(SQueue * _Nonnull)queue; -- (SSignal * _Nonnull)startOnThreadPool:(SThreadPool * _Nonnull)threadPool; -- (SSignal * _Nonnull)throttleOn:(SQueue * _Nonnull)queue delay:(NSTimeInterval)delay; +- (SSignal *)deliverOn:(SQueue *)queue; +- (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool; +- (SSignal *)startOn:(SQueue *)queue; +- (SSignal *)startOnThreadPool:(SThreadPool *)threadPool; +- (SSignal *)throttleOn:(SQueue *)queue delay:(NSTimeInterval)delay; @end diff --git a/SSignalKit/SSignal+Mapping.h b/SSignalKit/SSignal+Mapping.h index debbfb3..c824f27 100644 --- a/SSignalKit/SSignal+Mapping.h +++ b/SSignalKit/SSignal+Mapping.h @@ -4,9 +4,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Mapping) -- (SSignal * _Nonnull)map:(id _Nullable (^ _Nonnull)(id _Nullable))f; -- (SSignal * _Nonnull)filter:(bool (^ _Nonnull)(id _Nullable))f; -- (SSignal * _Nonnull)ignoreRepeated; +- (SSignal *)map:(id _Nullable (^)(id _Nullable))f; +- (SSignal *)filter:(bool (^)(id _Nullable))f; +- (SSignal *)ignoreRepeated; @end diff --git a/SSignalKit/SSignal+Meta.h b/SSignalKit/SSignal+Meta.h index 4c897ee..a088320 100644 --- a/SSignalKit/SSignal+Meta.h +++ b/SSignalKit/SSignal+Meta.h @@ -6,20 +6,20 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Meta) -- (SSignal * _Nonnull)switchToLatest; -- (SSignal * _Nonnull)mapToSignal:(SSignal * _Nonnull (^ _Nonnull)(id _Nullable))f; -- (SSignal * _Nonnull)mapToQueue:(SSignal * _Nonnull (^ _Nonnull)(id _Nullable))f; -- (SSignal * _Nonnull)mapToThrottled:(SSignal * _Nonnull (^ _Nonnull)(id _Nullable))f; -- (SSignal * _Nonnull)then:(SSignal * _Nonnull)signal; -- (SSignal * _Nonnull)queue; -- (SSignal * _Nonnull)throttled; -+ (SSignal * _Nonnull)defer:(SSignal * _Nonnull(^ _Nonnull)(void))generator; +- (SSignal *)switchToLatest; +- (SSignal *)mapToSignal:(SSignal * (^)(id _Nullable))f; +- (SSignal *)mapToQueue:(SSignal * (^)(id _Nullable))f; +- (SSignal *)mapToThrottled:(SSignal * (^)(id _Nullable))f; +- (SSignal *)then:(SSignal *)signal; +- (SSignal *)queue; +- (SSignal *)throttled; ++ (SSignal *)defer:(SSignal *(^)(void))generator; @end @interface SSignalQueue : NSObject -- (SSignal * _Nonnull)enqueue:(SSignal * _Nonnull)signal; +- (SSignal *)enqueue:(SSignal *)signal; @end diff --git a/SSignalKit/SSignal+Multicast.h b/SSignalKit/SSignal+Multicast.h index 889e05c..0c43f3e 100644 --- a/SSignalKit/SSignal+Multicast.h +++ b/SSignalKit/SSignal+Multicast.h @@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Multicast) -- (SSignal * _Nonnull)multicast; +- (SSignal *)multicast; @end diff --git a/SSignalKit/SSignal+Pipe.h b/SSignalKit/SSignal+Pipe.h index 15d14cd..b198928 100644 --- a/SSignalKit/SSignal+Pipe.h +++ b/SSignalKit/SSignal+Pipe.h @@ -4,10 +4,10 @@ NS_ASSUME_NONNULL_BEGIN @interface SPipe : NSObject -@property (nonatomic, copy, readonly) SSignal * _Nonnull (^ _Nonnull signalProducer)(void); -@property (nonatomic, copy, readonly) void (^ _Nonnull sink)(id _Nullable); +@property (nonatomic, copy, readonly) SSignal * (^ signalProducer)(void); +@property (nonatomic, copy, readonly) void (^ sink)(id _Nullable); -- (instancetype _Nonnull)initWithReplay:(bool)replay; +- (instancetype)initWithReplay:(bool)replay; @end diff --git a/SSignalKit/SSignal+SideEffects.h b/SSignalKit/SSignal+SideEffects.h index cbba146..ba74674 100644 --- a/SSignalKit/SSignal+SideEffects.h +++ b/SSignalKit/SSignal+SideEffects.h @@ -4,13 +4,13 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (SideEffects) -- (SSignal * _Nonnull)onStart:(void (^ _Nonnull)(void))f; -- (SSignal * _Nonnull)onNext:(void (^ _Nonnull)(id _Nullable next))f; -- (SSignal * _Nonnull)afterNext:(void (^ _Nonnull)(id _Nullable next))f; -- (SSignal * _Nonnull)onError:(void (^ _Nonnull)(id _Nullable error))f; -- (SSignal * _Nonnull)onCompletion:(void (^ _Nonnull)(void))f; -- (SSignal * _Nonnull)afterCompletion:(void (^ _Nonnull)(void))f; -- (SSignal * _Nonnull)onDispose:(void (^ _Nonnull)(void))f; +- (SSignal *)onStart:(void (^)(void))f; +- (SSignal *)onNext:(void (^)(id _Nullable next))f; +- (SSignal *)afterNext:(void (^)(id _Nullable next))f; +- (SSignal *)onError:(void (^)(id _Nullable error))f; +- (SSignal *)onCompletion:(void (^)(void))f; +- (SSignal *)afterCompletion:(void (^)(void))f; +- (SSignal *)onDispose:(void (^)(void))f; @end diff --git a/SSignalKit/SSignal+Single.h b/SSignalKit/SSignal+Single.h index fccec2c..a74e360 100644 --- a/SSignalKit/SSignal+Single.h +++ b/SSignalKit/SSignal+Single.h @@ -4,10 +4,10 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Single) -+ (SSignal * _Nonnull)single:(id _Nullable)next; -+ (SSignal * _Nonnull)fail:(id _Nullable)error; -+ (SSignal * _Nonnull)never; -+ (SSignal * _Nonnull)complete; ++ (SSignal *)single:(id _Nullable)next; ++ (SSignal *)fail:(id _Nullable)error; ++ (SSignal *)never; ++ (SSignal *)complete; @end diff --git a/SSignalKit/SSignal+Take.h b/SSignalKit/SSignal+Take.h index 9ed8d57..bebcf91 100644 --- a/SSignalKit/SSignal+Take.h +++ b/SSignalKit/SSignal+Take.h @@ -4,9 +4,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Take) -- (SSignal * _Nonnull)take:(NSUInteger)count; -- (SSignal * _Nonnull)takeLast; -- (SSignal * _Nonnull)takeUntilReplacement:(SSignal * _Nonnull)replacement; +- (SSignal *)take:(NSUInteger)count; +- (SSignal *)takeLast; +- (SSignal *)takeUntilReplacement:(SSignal *)replacement; @end diff --git a/SSignalKit/SSignal+Timing.h b/SSignalKit/SSignal+Timing.h index d4c4b5f..2820dc0 100644 --- a/SSignalKit/SSignal+Timing.h +++ b/SSignalKit/SSignal+Timing.h @@ -5,9 +5,9 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Timing) -- (SSignal * _Nonnull)delay:(NSTimeInterval)seconds onQueue:(SQueue * _Nonnull)queue; -- (SSignal * _Nonnull)timeout:(NSTimeInterval)seconds onQueue:(SQueue * _Nonnull)queue orSignal:(SSignal * _Nonnull)signal; -- (SSignal * _Nonnull)wait:(NSTimeInterval)seconds; +- (SSignal *)delay:(NSTimeInterval)seconds onQueue:(SQueue *)queue; +- (SSignal *)timeout:(NSTimeInterval)seconds onQueue:(SQueue *)queue orSignal:(SSignal *)signal; +- (SSignal *)wait:(NSTimeInterval)seconds; @end diff --git a/SSignalKit/SSignal.h b/SSignalKit/SSignal.h index a5aad36..9ef37b4 100644 --- a/SSignalKit/SSignal.h +++ b/SSignalKit/SSignal.h @@ -5,16 +5,16 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal : NSObject { @public - id _Nullable (^ _Nonnull _generator)(SSubscriber * _Nonnull); + id _Nullable (^ _generator)(SSubscriber *); } -- (instancetype _Nonnull)initWithGenerator:(id _Nullable (^ _Nonnull)(SSubscriber * _Nonnull))generator; +- (instancetype)initWithGenerator:(id _Nullable (^)(SSubscriber *))generator; - (id _Nullable)startWithNext:(void (^ _Nullable)(id _Nullable next))next error:(void (^ _Nullable)(id _Nullable error))error completed:(void (^ _Nullable)(void))completed; - (id _Nullable)startWithNext:(void (^ _Nullable)(id _Nullable next))next; - (id _Nullable)startWithNext:(void (^ _Nullable)(id _Nullable next))next completed:(void (^ _Nullable)(void))completed; -- (SSignal * _Nonnull)trace:(NSString * _Nonnull)name; +- (SSignal *)trace:(NSString *)name; @end diff --git a/SSignalKit/SSubscriber.h b/SSignalKit/SSubscriber.h index 7517495..56dbccc 100644 --- a/SSignalKit/SSubscriber.h +++ b/SSignalKit/SSubscriber.h @@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN { } -- (instancetype _Nonnull)initWithNext:(void (^ _Nullable)(id _Nullable))next error:(void (^ _Nullable)(id _Nullable))error completed:(void (^ _Nullable)(void))completed; +- (instancetype)initWithNext:(void (^ _Nullable)(id _Nullable))next error:(void (^ _Nullable)(id _Nullable))error completed:(void (^ _Nullable)(void))completed; - (void)_assignDisposable:(id _Nullable)disposable; - (void)_markTerminatedWithoutDisposal; @@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN @interface STracingSubscriber : SSubscriber -- (instancetype _Nonnull)initWithName:(NSString * _Nonnull)name next:(void (^ _Nullable)(id _Nullable))next error:(void (^ _Nullable)(id _Nullable))error completed:(void (^ _Nullable)(void))completed; +- (instancetype)initWithName:(NSString *)name next:(void (^ _Nullable)(id _Nullable))next error:(void (^ _Nullable)(id _Nullable))error completed:(void (^ _Nullable)(void))completed; @end diff --git a/SSignalKit/SThreadPool.h b/SSignalKit/SThreadPool.h index c0a3925..75b7ee0 100644 --- a/SSignalKit/SThreadPool.h +++ b/SSignalKit/SThreadPool.h @@ -7,12 +7,12 @@ NS_ASSUME_NONNULL_BEGIN @interface SThreadPool : NSObject -- (instancetype _Nonnull)initWithThreadCount:(NSUInteger)threadCount threadPriority:(double)threadPriority; +- (instancetype)initWithThreadCount:(NSUInteger)threadCount threadPriority:(double)threadPriority; -- (void)addTask:(SThreadPoolTask * _Nonnull)task; +- (void)addTask:(SThreadPoolTask *)task; -- (SThreadPoolQueue * _Nonnull)nextQueue; -- (void)_workOnQueue:(SThreadPoolQueue * _Nonnull)queue block:(void (^ _Nonnull)(void))block; +- (SThreadPoolQueue *)nextQueue; +- (void)_workOnQueue:(SThreadPoolQueue *)queue block:(void (^)(void))block; @end diff --git a/SSignalKit/SThreadPoolQueue.h b/SSignalKit/SThreadPoolQueue.h index cb7ef86..e889a77 100644 --- a/SSignalKit/SThreadPoolQueue.h +++ b/SSignalKit/SThreadPoolQueue.h @@ -7,8 +7,8 @@ NS_ASSUME_NONNULL_BEGIN @interface SThreadPoolQueue : NSObject -- (instancetype _Nonnull)initWithThreadPool:(SThreadPool * _Nonnull)threadPool; -- (void)addTask:(SThreadPoolTask * _Nonnull)task; +- (instancetype)initWithThreadPool:(SThreadPool *)threadPool; +- (void)addTask:(SThreadPoolTask *)task; - (SThreadPoolTask * _Nullable)_popFirstTask; - (bool)_hasTasks; diff --git a/SSignalKit/SThreadPoolTask.h b/SSignalKit/SThreadPoolTask.h index f68a4d7..a70c8e5 100644 --- a/SSignalKit/SThreadPoolTask.h +++ b/SSignalKit/SThreadPoolTask.h @@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SThreadPoolTask : NSObject -- (instancetype _Nonnull)initWithBlock:(void (^ _Nonnull)(bool (^ _Nonnull)(void)))block; +- (instancetype)initWithBlock:(void (^)(bool (^)(void)))block; - (void)execute; - (void)cancel; diff --git a/SSignalKit/STimer.h b/SSignalKit/STimer.h index 0b30ab5..e6a8e90 100644 --- a/SSignalKit/STimer.h +++ b/SSignalKit/STimer.h @@ -6,8 +6,8 @@ NS_ASSUME_NONNULL_BEGIN @interface STimer : NSObject -- (instancetype _Nonnull)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t _Nonnull)completion queue:(SQueue * _Nonnull)queue; -- (instancetype _Nonnull)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t _Nonnull)completion nativeQueue:(dispatch_queue_t _Nonnull)nativeQueue; +- (instancetype)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion queue:(SQueue *)queue; +- (instancetype)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion nativeQueue:(dispatch_queue_t)nativeQueue; - (void)start; - (void)invalidate; diff --git a/SSignalKit/SVariable.h b/SSignalKit/SVariable.h index ea98f11..bd369be 100644 --- a/SSignalKit/SVariable.h +++ b/SSignalKit/SVariable.h @@ -6,10 +6,10 @@ NS_ASSUME_NONNULL_BEGIN @interface SVariable : NSObject -- (instancetype _Nonnull)init; +- (instancetype)init; -- (void)set:(SSignal * _Nonnull)signal; -- (SSignal * _Nonnull)signal; +- (void)set:(SSignal *)signal; +- (SSignal *)signal; @end From 40c9d1df105065b6354b69cd0f5773d92a298e17 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sun, 7 Nov 2021 10:39:24 +0800 Subject: [PATCH 7/9] Support SwiftPM --- Package.swift | 53 +++++++++++++++++++++++ SSignalKitTests/SDisposableTests.m | 2 +- SSignalKitTests/SSignalBasicTests.m | 2 +- SSignalKitTests/SSignalPerformanceTests.m | 2 +- 4 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 Package.swift diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..1eda363 --- /dev/null +++ b/Package.swift @@ -0,0 +1,53 @@ +// swift-tools-version:5.0 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "SSignalKit", + platforms: [ + .macOS(.v10_10), .iOS(.v9), .tvOS(.v9) + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "SSignalKit", + targets: [ "SSignalKit" ]), + .library( + name: "SwiftSignalKit", + targets: [ "SwiftSignalKit" ]) + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "SSignalKit", + path: ".", + sources: [ "SSignalKit" ], + cSettings: [ + .headerSearchPath(".") + ]), + .target( + name: "SwiftSignalKit", + path: ".", + sources: [ "SwiftSignalKit" ]), + .testTarget(name: "SSignalKitTests", + dependencies: [ "SSignalKit" ], + path: ".", + sources: [ "SSignalKitTests" ], + cSettings: [ + .headerSearchPath(".") + ]), + .testTarget(name: "SwiftSignalKitTests", + dependencies: [ "SwiftSignalKit" ], + path: ".", + sources: [ "SwiftSignalKitTests" ]) + ], + swiftLanguageVersions: [.v5], + cLanguageStandard: .gnu11, + cxxLanguageStandard: .gnucxx14 +) diff --git a/SSignalKitTests/SDisposableTests.m b/SSignalKitTests/SDisposableTests.m index 3c71105..397e7c4 100644 --- a/SSignalKitTests/SDisposableTests.m +++ b/SSignalKitTests/SDisposableTests.m @@ -7,7 +7,7 @@ #import -@import SSignalKit; +#import #import "DeallocatingObject.h" diff --git a/SSignalKitTests/SSignalBasicTests.m b/SSignalKitTests/SSignalBasicTests.m index ac00a69..eeb317a 100644 --- a/SSignalKitTests/SSignalBasicTests.m +++ b/SSignalKitTests/SSignalBasicTests.m @@ -5,7 +5,7 @@ #endif #import -@import SSignalKit; +#import #import "DeallocatingObject.h" diff --git a/SSignalKitTests/SSignalPerformanceTests.m b/SSignalKitTests/SSignalPerformanceTests.m index f5384d7..7ba45e0 100644 --- a/SSignalKitTests/SSignalPerformanceTests.m +++ b/SSignalKitTests/SSignalPerformanceTests.m @@ -5,7 +5,7 @@ #endif #import -@import SSignalKit; +#import @interface SSignalPerformanceTests : XCTestCase From f7f551d5989a05c8379891d36ede035105958d91 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sun, 7 Nov 2021 10:50:26 +0800 Subject: [PATCH 8/9] Update .gitignore for SwiftPM --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 249d367..0cad67e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,5 @@ DerivedData *.dSYM.zip *.ipa */xcuserdata/* +.swiftpm +.build From d4f809899c48f36728fe3f581e92e525634a7306 Mon Sep 17 00:00:00 2001 From: "Lvv.me" Date: Sun, 7 Nov 2021 15:24:50 +0800 Subject: [PATCH 9/9] Using BOOL for Objective-C framework --- SSignalKit/SAtomic.h | 2 +- SSignalKit/SAtomic.m | 4 +- SSignalKit/SBag.h | 2 +- SSignalKit/SBag.m | 2 +- SSignalKit/SDisposableSet.m | 6 +- SSignalKit/SMetaDisposable.m | 6 +- SSignalKit/SMulticastSignalManager.m | 4 +- SSignalKit/SQueue.h | 4 +- SSignalKit/SQueue.m | 14 +-- SSignalKit/SSignal+Catch.h | 2 +- SSignalKit/SSignal+Catch.m | 12 +- SSignalKit/SSignal+Combine.m | 26 ++-- SSignalKit/SSignal+Dispatch.m | 34 ++--- SSignalKit/SSignal+Mapping.h | 2 +- SSignalKit/SSignal+Mapping.m | 14 +-- SSignalKit/SSignal+Meta.m | 32 ++--- SSignalKit/SSignal+Multicast.m | 6 +- SSignalKit/SSignal+Pipe.h | 2 +- SSignalKit/SSignal+Pipe.m | 12 +- SSignalKit/SSignal+Take.m | 8 +- SSignalKit/SSignal+Timing.m | 4 +- SSignalKit/SSubscriber.m | 34 ++--- SSignalKit/SThreadPool.m | 4 +- SSignalKit/SThreadPoolQueue.h | 2 +- SSignalKit/SThreadPoolQueue.m | 2 +- SSignalKit/SThreadPoolTask.h | 2 +- SSignalKit/SThreadPoolTask.m | 10 +- SSignalKit/STimer.h | 4 +- SSignalKit/STimer.m | 6 +- SSignalKit/SVariable.m | 8 +- SSignalKitTests/DeallocatingObject.h | 2 +- SSignalKitTests/DeallocatingObject.m | 6 +- SSignalKitTests/SDisposableTests.m | 96 +++++++------- SSignalKitTests/SSignalBasicTests.m | 180 +++++++++++++-------------- 34 files changed, 277 insertions(+), 277 deletions(-) diff --git a/SSignalKit/SAtomic.h b/SSignalKit/SAtomic.h index 77def05..d2300e0 100644 --- a/SSignalKit/SAtomic.h +++ b/SSignalKit/SAtomic.h @@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SAtomic : NSObject - (instancetype)initWithValue:(id _Nullable)value; -- (instancetype)initWithValue:(id _Nullable)value recursive:(bool)recursive; +- (instancetype)initWithValue:(id _Nullable)value recursive:(BOOL)recursive; - (id _Nullable)swap:(id _Nullable)newValue; - (id _Nullable)value; - (id _Nullable)modify:(id _Nullable (^)(id _Nullable))f; diff --git a/SSignalKit/SAtomic.m b/SSignalKit/SAtomic.m index 5f7f3d1..bd52f5c 100644 --- a/SSignalKit/SAtomic.m +++ b/SSignalKit/SAtomic.m @@ -6,7 +6,7 @@ @interface SAtomic () { pthread_mutex_t _lock; pthread_mutexattr_t _attr; - bool _isRecursive; + BOOL _isRecursive; id _value; } @@ -25,7 +25,7 @@ - (instancetype)initWithValue:(id)value return self; } -- (instancetype)initWithValue:(id)value recursive:(bool)recursive { +- (instancetype)initWithValue:(id)value recursive:(BOOL)recursive { self = [super init]; if (self != nil) { diff --git a/SSignalKit/SBag.h b/SSignalKit/SBag.h index df5d819..48c7629 100644 --- a/SSignalKit/SBag.h +++ b/SSignalKit/SBag.h @@ -7,7 +7,7 @@ NS_ASSUME_NONNULL_BEGIN - (NSInteger)addItem:(id)item; - (void)enumerateItems:(void (^)(id))block; - (void)removeItem:(NSInteger)key; -- (bool)isEmpty; +- (BOOL)isEmpty; - (NSArray *)copyItems; @end diff --git a/SSignalKit/SBag.m b/SSignalKit/SBag.m index c83f206..1c9825d 100644 --- a/SSignalKit/SBag.m +++ b/SSignalKit/SBag.m @@ -61,7 +61,7 @@ - (void)removeItem:(NSInteger)key } } -- (bool)isEmpty +- (BOOL)isEmpty { return _items.count == 0; } diff --git a/SSignalKit/SDisposableSet.m b/SSignalKit/SDisposableSet.m index 18cb3be..0ffce34 100644 --- a/SSignalKit/SDisposableSet.m +++ b/SSignalKit/SDisposableSet.m @@ -7,7 +7,7 @@ @interface SDisposableSet () { OSSpinLock _lock; - bool _disposed; + BOOL _disposed; id _singleDisposable; NSArray *_multipleDisposables; } @@ -21,7 +21,7 @@ - (void)add:(id)disposable if (disposable == nil) return; - bool dispose = false; + BOOL dispose = NO; OSSpinLockLock(&_lock); dispose = _disposed; @@ -73,7 +73,7 @@ - (void)dispose OSSpinLockLock(&_lock); if (!_disposed) { - _disposed = true; + _disposed = YES; singleDisposable = _singleDisposable; multipleDisposables = _multipleDisposables; _singleDisposable = nil; diff --git a/SSignalKit/SMetaDisposable.m b/SSignalKit/SMetaDisposable.m index 4e9c8e4..0d28e0c 100644 --- a/SSignalKit/SMetaDisposable.m +++ b/SSignalKit/SMetaDisposable.m @@ -5,7 +5,7 @@ @interface SMetaDisposable () { OSSpinLock _lock; - bool _disposed; + BOOL _disposed; id _disposable; } @@ -16,7 +16,7 @@ @implementation SMetaDisposable - (void)setDisposable:(id)disposable { id previousDisposable = nil; - bool dispose = false; + BOOL dispose = NO; OSSpinLockLock(&_lock); dispose = _disposed; @@ -42,7 +42,7 @@ - (void)dispose if (!_disposed) { disposable = _disposable; - _disposed = true; + _disposed = YES; } OSSpinLockUnlock(&_lock); diff --git a/SSignalKit/SMulticastSignalManager.m b/SSignalKit/SMulticastSignalManager.m index bdaa38e..43eefd0 100644 --- a/SSignalKit/SMulticastSignalManager.m +++ b/SSignalKit/SMulticastSignalManager.m @@ -88,12 +88,12 @@ - (void)startStandaloneSignalIfNotRunningForKey:(NSString *)key producer:(SSigna if (key == nil) return; - bool produce = false; + BOOL produce = NO; OSSpinLockLock(&_lock); if (_standaloneSignalDisposables[key] == nil) { _standaloneSignalDisposables[key] = [[SMetaDisposable alloc] init]; - produce = true; + produce = YES; } OSSpinLockUnlock(&_lock); diff --git a/SSignalKit/SQueue.h b/SSignalKit/SQueue.h index a861878..ccc9502 100644 --- a/SSignalKit/SQueue.h +++ b/SSignalKit/SQueue.h @@ -12,11 +12,11 @@ NS_ASSUME_NONNULL_BEGIN - (void)dispatch:(dispatch_block_t)block; - (void)dispatchSync:(dispatch_block_t)block; -- (void)dispatch:(dispatch_block_t)block synchronous:(bool)synchronous; +- (void)dispatch:(dispatch_block_t)block synchronous:(BOOL)synchronous; - (dispatch_queue_t)_dispatch_queue; -- (bool)isCurrentQueue; +- (BOOL)isCurrentQueue; @end diff --git a/SSignalKit/SQueue.m b/SSignalKit/SQueue.m index d5b5553..75cdac9 100644 --- a/SSignalKit/SQueue.m +++ b/SSignalKit/SQueue.m @@ -6,7 +6,7 @@ @interface SQueue () { dispatch_queue_t _queue; void *_queueSpecific; - bool _specialIsMainQueue; + BOOL _specialIsMainQueue; } @end @@ -20,7 +20,7 @@ + (SQueue *)mainQueue dispatch_once(&onceToken, ^ { queue = [[SQueue alloc] initWithNativeQueue:dispatch_get_main_queue() queueSpecific:NULL]; - queue->_specialIsMainQueue = true; + queue->_specialIsMainQueue = YES; }); return queue; @@ -98,7 +98,7 @@ - (void)dispatchSync:(dispatch_block_t)block dispatch_sync(_queue, block); } -- (void)dispatch:(dispatch_block_t)block synchronous:(bool)synchronous { +- (void)dispatch:(dispatch_block_t)block synchronous:(BOOL)synchronous { if (_queueSpecific != NULL && dispatch_get_specific(SQueueSpecificKey) == _queueSpecific) block(); else if (_specialIsMainQueue && [NSThread isMainThread]) @@ -112,13 +112,13 @@ - (void)dispatch:(dispatch_block_t)block synchronous:(bool)synchronous { } } -- (bool)isCurrentQueue +- (BOOL)isCurrentQueue { if (_queueSpecific != NULL && dispatch_get_specific(SQueueSpecificKey) == _queueSpecific) - return true; + return YES; else if (_specialIsMainQueue && [NSThread isMainThread]) - return true; - return false; + return YES; + return NO; } @end diff --git a/SSignalKit/SSignal+Catch.h b/SSignalKit/SSignal+Catch.h index 3191ac8..9e0b653 100644 --- a/SSignalKit/SSignal+Catch.h +++ b/SSignalKit/SSignal+Catch.h @@ -6,7 +6,7 @@ NS_ASSUME_NONNULL_BEGIN - (SSignal *)catch:(SSignal * (^ )(id _Nullable error))f; - (SSignal *)restart; -- (SSignal *)retryIf:(bool (^)(id _Nullable error))predicate; +- (SSignal *)retryIf:(BOOL (^)(id _Nullable error))predicate; @end diff --git a/SSignalKit/SSignal+Catch.m b/SSignalKit/SSignal+Catch.m index 8726365..3effd57 100644 --- a/SSignalKit/SSignal+Catch.m +++ b/SSignalKit/SSignal+Catch.m @@ -50,7 +50,7 @@ - (SSignal *)restart { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { - SAtomic *shouldRestart = [[SAtomic alloc] initWithValue:@true]; + SAtomic *shouldRestart = [[SAtomic alloc] initWithValue:@YES]; SMetaDisposable *currentDisposable = [[SMetaDisposable alloc] init]; @@ -85,16 +85,16 @@ - (SSignal *)restart [shouldRestart modify:^id(__unused id current) { - return @false; + return @NO; }]; }]; }]; } -- (SSignal *)retryIf:(bool (^)(id error))predicate { +- (SSignal *)retryIf:(BOOL (^)(id error))predicate { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { - SAtomic *shouldRestart = [[SAtomic alloc] initWithValue:@true]; + SAtomic *shouldRestart = [[SAtomic alloc] initWithValue:@YES]; SMetaDisposable *currentDisposable = [[SMetaDisposable alloc] init]; @@ -120,7 +120,7 @@ - (SSignal *)retryIf:(bool (^)(id error))predicate { } completed:^ { [shouldRestart modify:^id(__unused id current) { - return @false; + return @NO; }]; [subscriber putCompletion]; }]; @@ -138,7 +138,7 @@ - (SSignal *)retryIf:(bool (^)(id error))predicate { [shouldRestart modify:^id(__unused id current) { - return @false; + return @NO; }]; }]; }]; diff --git a/SSignalKit/SSignal+Combine.m b/SSignalKit/SSignal+Combine.m index 4df70c1..efa3fb3 100644 --- a/SSignalKit/SSignal+Combine.m +++ b/SSignalKit/SSignal+Combine.m @@ -8,13 +8,13 @@ @interface SSignalCombineState : NSObject @property (nonatomic, strong, readonly) NSDictionary *latestValues; @property (nonatomic, strong, readonly) NSArray *completedStatuses; -@property (nonatomic) bool error; +@property (nonatomic) BOOL error; @end @implementation SSignalCombineState -- (instancetype)initWithLatestValues:(NSDictionary *)latestValues completedStatuses:(NSArray *)completedStatuses error:(bool)error +- (instancetype)initWithLatestValues:(NSDictionary *)latestValues completedStatuses:(NSArray *)completedStatuses error:(BOOL)error { self = [super init]; if (self != nil) @@ -45,14 +45,14 @@ + (SSignal *)combineSignals:(NSArray *)signals withInitialStates:(NSArray *)init NSMutableArray *completedStatuses = [[NSMutableArray alloc] init]; for (NSUInteger i = 0; i < signals.count; i++) { - [completedStatuses addObject:@false]; + [completedStatuses addObject:@NO]; } NSMutableDictionary *initialLatestValues = [[NSMutableDictionary alloc] init]; for (NSUInteger i = 0; i < initialStates.count; i++) { initialLatestValues[@(i)] = initialStates[i]; } - SAtomic *combineState = [[SAtomic alloc] initWithValue:[[SSignalCombineState alloc] initWithLatestValues:initialLatestValues completedStatuses:completedStatuses error:false]]; + SAtomic *combineState = [[SAtomic alloc] initWithValue:[[SSignalCombineState alloc] initWithLatestValues:initialLatestValues completedStatuses:completedStatuses error:NO]]; SDisposableSet *compositeDisposable = [[SDisposableSet alloc] init]; @@ -84,37 +84,37 @@ + (SSignal *)combineSignals:(NSArray *)signals withInitialStates:(NSArray *)init } error:^(id error) { - __block bool hadError = false; + __block BOOL hadError = NO; [combineState modify:^id(SSignalCombineState *state) { hadError = state.error; - return [[SSignalCombineState alloc] initWithLatestValues:state.latestValues completedStatuses:state.completedStatuses error:true]; + return [[SSignalCombineState alloc] initWithLatestValues:state.latestValues completedStatuses:state.completedStatuses error:YES]; }]; if (!hadError) [subscriber putError:error]; } completed:^ { - __block bool wasCompleted = false; - __block bool isCompleted = false; + __block BOOL wasCompleted = NO; + __block BOOL isCompleted = NO; [combineState modify:^id(SSignalCombineState *state) { NSMutableArray *completedStatuses = [[NSMutableArray alloc] initWithArray:state.completedStatuses]; - bool everyStatusWasCompleted = true; + BOOL everyStatusWasCompleted = YES; for (NSNumber *nStatus in completedStatuses) { if (![nStatus boolValue]) { - everyStatusWasCompleted = false; + everyStatusWasCompleted = NO; break; } } - completedStatuses[index] = @true; - bool everyStatusIsCompleted = true; + completedStatuses[index] = @YES; + BOOL everyStatusIsCompleted = YES; for (NSNumber *nStatus in completedStatuses) { if (![nStatus boolValue]) { - everyStatusIsCompleted = false; + everyStatusIsCompleted = NO; break; } } diff --git a/SSignalKit/SSignal+Dispatch.m b/SSignalKit/SSignal+Dispatch.m index 002773a..17e6537 100644 --- a/SSignalKit/SSignal+Dispatch.m +++ b/SSignalKit/SSignal+Dispatch.m @@ -7,14 +7,14 @@ @interface SSignal_ThrottleContainer : NSObject @property (nonatomic, strong, readonly) id value; -@property (nonatomic, readonly) bool committed; -@property (nonatomic, readonly) bool last; +@property (nonatomic, readonly) BOOL committed; +@property (nonatomic, readonly) BOOL last; @end @implementation SSignal_ThrottleContainer -- (instancetype)initWithValue:(id)value committed:(bool)committed last:(bool)last { +- (instancetype)initWithValue:(id)value committed:(BOOL)committed last:(BOOL)last { self = [super init]; if (self != nil) { _value = value; @@ -61,7 +61,7 @@ - (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool SThreadPoolQueue *queue = [threadPool nextQueue]; return [self startWithNext:^(id next) { - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(BOOL (^cancelled)(void)) { if (!cancelled()) [subscriber putNext:next]; @@ -69,7 +69,7 @@ - (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool [queue addTask:task]; } error:^(id error) { - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(BOOL (^cancelled)(void)) { if (!cancelled()) [subscriber putError:error]; @@ -77,7 +77,7 @@ - (SSignal *)deliverOnThreadPool:(SThreadPool *)threadPool [queue addTask:task]; } completed:^ { - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(BOOL (^cancelled)(void)) { if (!cancelled()) [subscriber putCompletion]; @@ -91,11 +91,11 @@ - (SSignal *)startOn:(SQueue *)queue { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { - __block bool isCancelled = false; + __block BOOL isCancelled = NO; SMetaDisposable *disposable = [[SMetaDisposable alloc] init]; [disposable setDisposable:[[SBlockDisposable alloc] initWithBlock:^ { - isCancelled = true; + isCancelled = YES; }]]; [queue dispatch:^ @@ -125,7 +125,7 @@ - (SSignal *)startOnThreadPool:(SThreadPool *)threadPool { SMetaDisposable *disposable = [[SMetaDisposable alloc] init]; - SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(bool (^cancelled)(void)) + SThreadPoolTask *task = [[SThreadPoolTask alloc] initWithBlock:^(BOOL (^cancelled)(void)) { if (cancelled && cancelled()) return; @@ -157,12 +157,12 @@ - (SSignal *)throttleOn:(SQueue *)queue delay:(NSTimeInterval)delay { return [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { SAtomic *value = [[SAtomic alloc] initWithValue:nil]; - STimer *timer = [[STimer alloc] initWithTimeout:delay repeat:false completion:^{ + STimer *timer = [[STimer alloc] initWithTimeout:delay repeat:NO completion:^{ [value modify:^id(SSignal_ThrottleContainer *container) { if (container != nil) { if (!container.committed) { [subscriber putNext:container.value]; - container = [[SSignal_ThrottleContainer alloc] initWithValue:container.value committed:true last:container.last]; + container = [[SSignal_ThrottleContainer alloc] initWithValue:container.value committed:YES last:container.last]; } if (container.last) { @@ -176,7 +176,7 @@ - (SSignal *)throttleOn:(SQueue *)queue delay:(NSTimeInterval)delay return [[self deliverOn:queue] startWithNext:^(id next) { [value modify:^id(SSignal_ThrottleContainer *container) { if (container == nil) { - container = [[SSignal_ThrottleContainer alloc] initWithValue:next committed:false last:false]; + container = [[SSignal_ThrottleContainer alloc] initWithValue:next committed:NO last:NO]; } return container; }]; @@ -187,15 +187,15 @@ - (SSignal *)throttleOn:(SQueue *)queue delay:(NSTimeInterval)delay [subscriber putError:error]; } completed:^{ [timer invalidate]; - __block bool start = false; + __block BOOL start = NO; [value modify:^id(SSignal_ThrottleContainer *container) { - bool wasCommitted = false; + BOOL wasCommitted = NO; if (container == nil) { - wasCommitted = true; - container = [[SSignal_ThrottleContainer alloc] initWithValue:nil committed:true last:true]; + wasCommitted = YES; + container = [[SSignal_ThrottleContainer alloc] initWithValue:nil committed:YES last:YES]; } else { wasCommitted = container.committed; - container = [[SSignal_ThrottleContainer alloc] initWithValue:container.value committed:container.committed last:true]; + container = [[SSignal_ThrottleContainer alloc] initWithValue:container.value committed:container.committed last:YES]; } start = wasCommitted; return container; diff --git a/SSignalKit/SSignal+Mapping.h b/SSignalKit/SSignal+Mapping.h index c824f27..3d4ff98 100644 --- a/SSignalKit/SSignal+Mapping.h +++ b/SSignalKit/SSignal+Mapping.h @@ -5,7 +5,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SSignal (Mapping) - (SSignal *)map:(id _Nullable (^)(id _Nullable))f; -- (SSignal *)filter:(bool (^)(id _Nullable))f; +- (SSignal *)filter:(BOOL (^)(id _Nullable))f; - (SSignal *)ignoreRepeated; @end diff --git a/SSignalKit/SSignal+Mapping.m b/SSignalKit/SSignal+Mapping.m index cd3a3ec..d3319cc 100644 --- a/SSignalKit/SSignal+Mapping.m +++ b/SSignalKit/SSignal+Mapping.m @@ -5,7 +5,7 @@ @interface SSignalIgnoreRepeatedState: NSObject @property (nonatomic, strong) id value; -@property (nonatomic) bool hasValue; +@property (nonatomic) BOOL hasValue; @end @@ -32,7 +32,7 @@ - (SSignal *)map:(id (^)(id))f }]; } -- (SSignal *)filter:(bool (^)(id))f +- (SSignal *)filter:(BOOL (^)(id))f { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { @@ -55,16 +55,16 @@ - (SSignal *)ignoreRepeated { SAtomic *state = [[SAtomic alloc] initWithValue:[[SSignalIgnoreRepeatedState alloc] init]]; return [self startWithNext:^(id next) { - bool shouldPassthrough = [[state with:^id(SSignalIgnoreRepeatedState *state) { + BOOL shouldPassthrough = [[state with:^id(SSignalIgnoreRepeatedState *state) { if (!state.hasValue) { - state.hasValue = true; + state.hasValue = YES; state.value = next; - return @true; + return @YES; } else if ((state.value == nil && next == nil) || [(id)state.value isEqual:next]) { - return @false; + return @NO; } state.value = next; - return @true; + return @YES; }] boolValue]; if (shouldPassthrough) { diff --git a/SSignalKit/SSignal+Meta.m b/SSignalKit/SSignal+Meta.m index 7e0c496..3fe384d 100644 --- a/SSignalKit/SSignal+Meta.m +++ b/SSignalKit/SSignal+Meta.m @@ -11,23 +11,23 @@ @interface SSignalQueueState : NSObject { OSSpinLock _lock; - bool _executingSignal; - bool _terminated; + BOOL _executingSignal; + BOOL _terminated; id _disposable; SMetaDisposable *_currentDisposable; SSubscriber *_subscriber; NSMutableArray *_queuedSignals; - bool _queueMode; - bool _throttleMode; + BOOL _queueMode; + BOOL _throttleMode; } @end @implementation SSignalQueueState -- (instancetype)initWithSubscriber:(SSubscriber *)subscriber queueMode:(bool)queueMode throttleMode:(bool)throttleMode +- (instancetype)initWithSubscriber:(SSubscriber *)subscriber queueMode:(BOOL)queueMode throttleMode:(BOOL)throttleMode { self = [super init]; if (self != nil) @@ -48,7 +48,7 @@ - (void)beginWithDisposable:(id)disposable - (void)enqueueSignal:(SSignal *)signal { - bool startSignal = false; + BOOL startSignal = NO; OSSpinLockLock(&_lock); if (_queueMode && _executingSignal) { if (_throttleMode) { @@ -58,8 +58,8 @@ - (void)enqueueSignal:(SSignal *)signal } else { - _executingSignal = true; - startSignal = true; + _executingSignal = YES; + startSignal = YES; } OSSpinLockUnlock(&_lock); @@ -88,9 +88,9 @@ - (void)headCompleted { SSignal *nextSignal = nil; - bool terminated = false; + BOOL terminated = NO; OSSpinLockLock(&_lock); - _executingSignal = false; + _executingSignal = NO; if (_queueMode) { @@ -98,7 +98,7 @@ - (void)headCompleted { nextSignal = _queuedSignals[0]; [_queuedSignals removeObjectAtIndex:0]; - _executingSignal = true; + _executingSignal = YES; } else terminated = _terminated; @@ -132,10 +132,10 @@ - (void)headCompleted - (void)beginCompletion { - bool executingSignal = false; + BOOL executingSignal = NO; OSSpinLockLock(&_lock); executingSignal = _executingSignal; - _terminated = true; + _terminated = YES; OSSpinLockUnlock(&_lock); if (!executingSignal) @@ -156,7 +156,7 @@ - (SSignal *)switchToLatest { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { - SSignalQueueState *state = [[SSignalQueueState alloc] initWithSubscriber:subscriber queueMode:false throttleMode:false]; + SSignalQueueState *state = [[SSignalQueueState alloc] initWithSubscriber:subscriber queueMode:NO throttleMode:NO]; [state beginWithDisposable:[self startWithNext:^(id next) { @@ -224,7 +224,7 @@ - (SSignal *)queue { return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { - SSignalQueueState *state = [[SSignalQueueState alloc] initWithSubscriber:subscriber queueMode:true throttleMode:false]; + SSignalQueueState *state = [[SSignalQueueState alloc] initWithSubscriber:subscriber queueMode:YES throttleMode:NO]; [state beginWithDisposable:[self startWithNext:^(id next) { @@ -243,7 +243,7 @@ - (SSignal *)queue - (SSignal *)throttled { return [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - SSignalQueueState *state = [[SSignalQueueState alloc] initWithSubscriber:subscriber queueMode:true throttleMode:true]; + SSignalQueueState *state = [[SSignalQueueState alloc] initWithSubscriber:subscriber queueMode:YES throttleMode:YES]; [state beginWithDisposable:[self startWithNext:^(id next) { [state enqueueSignal:next]; diff --git a/SSignalKit/SSignal+Multicast.m b/SSignalKit/SSignal+Multicast.m index 92976cf..abe9461 100644 --- a/SSignalKit/SSignal+Multicast.m +++ b/SSignalKit/SSignal+Multicast.m @@ -38,13 +38,13 @@ - (void)setDisposable:(id)disposable _disposable = disposable; } -- (id)addSubscriber:(SSubscriber *)subscriber start:(bool *)start +- (id)addSubscriber:(SSubscriber *)subscriber start:(BOOL *)start { OSSpinLockLock(&_lock); NSInteger index = [_subscribers addItem:subscriber]; switch (_state) { case SSignalMulticastStateReady: - *start = true; + *start = YES; _state = SSignalMulticastStateStarted; break; default: @@ -130,7 +130,7 @@ - (SSignal *)multicast SSignalMulticastSubscribers *subscribers = [[SSignalMulticastSubscribers alloc] init]; return [[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { - bool start = false; + BOOL start = NO; id currentDisposable = [subscribers addSubscriber:subscriber start:&start]; if (start) { diff --git a/SSignalKit/SSignal+Pipe.h b/SSignalKit/SSignal+Pipe.h index b198928..00f719e 100644 --- a/SSignalKit/SSignal+Pipe.h +++ b/SSignalKit/SSignal+Pipe.h @@ -7,7 +7,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, copy, readonly) SSignal * (^ signalProducer)(void); @property (nonatomic, copy, readonly) void (^ sink)(id _Nullable); -- (instancetype)initWithReplay:(bool)replay; +- (instancetype)initWithReplay:(BOOL)replay; @end diff --git a/SSignalKit/SSignal+Pipe.m b/SSignalKit/SSignal+Pipe.m index ab9496a..4d7a287 100644 --- a/SSignalKit/SSignal+Pipe.m +++ b/SSignalKit/SSignal+Pipe.m @@ -6,14 +6,14 @@ @interface SPipeReplayState : NSObject -@property (nonatomic, readonly) bool hasReceivedValue; +@property (nonatomic, readonly) BOOL hasReceivedValue; @property (nonatomic, strong, readonly) id recentValue; @end @implementation SPipeReplayState -- (instancetype)initWithReceivedValue:(bool)receivedValue recentValue:(id)recentValue +- (instancetype)initWithReceivedValue:(BOOL)receivedValue recentValue:(id)recentValue { self = [super init]; if (self != nil) @@ -30,16 +30,16 @@ @implementation SPipe - (instancetype)init { - return [self initWithReplay:false]; + return [self initWithReplay:NO]; } -- (instancetype)initWithReplay:(bool)replay +- (instancetype)initWithReplay:(BOOL)replay { self = [super init]; if (self != nil) { SAtomic *subscribers = [[SAtomic alloc] initWithValue:[[SBag alloc] init]]; - SAtomic *replayState = replay ? [[SAtomic alloc] initWithValue:[[SPipeReplayState alloc] initWithReceivedValue:false recentValue:nil]] : nil; + SAtomic *replayState = replay ? [[SAtomic alloc] initWithValue:[[SPipeReplayState alloc] initWithReceivedValue:NO recentValue:nil]] : nil; _signalProducer = [^SSignal * { @@ -92,7 +92,7 @@ - (instancetype)initWithReplay:(bool)replay { [replayState modify:^id(__unused SPipeReplayState *state) { - return [[SPipeReplayState alloc] initWithReceivedValue:true recentValue:next]; + return [[SPipeReplayState alloc] initWithReceivedValue:YES recentValue:next]; }]; } } copy]; diff --git a/SSignalKit/SSignal+Take.m b/SSignalKit/SSignal+Take.m index e5db9fa..67a14cb 100644 --- a/SSignalKit/SSignal+Take.m +++ b/SSignalKit/SSignal+Take.m @@ -29,15 +29,15 @@ - (SSignal *)take:(NSUInteger)count SAtomic *counter = [[SAtomic alloc] initWithValue:@(0)]; return [self startWithNext:^(id next) { - __block bool passthrough = false; - __block bool complete = false; + __block BOOL passthrough = NO; + __block BOOL complete = NO; [counter modify:^id(NSNumber *currentCount) { NSUInteger updatedCount = [currentCount unsignedIntegerValue] + 1; if (updatedCount <= count) - passthrough = true; + passthrough = YES; if (updatedCount == count) - complete = true; + complete = YES; return @(updatedCount); }]; diff --git a/SSignalKit/SSignal+Timing.m b/SSignalKit/SSignal+Timing.m index 3d0dbc4..1417b69 100644 --- a/SSignalKit/SSignal+Timing.m +++ b/SSignalKit/SSignal+Timing.m @@ -16,7 +16,7 @@ - (SSignal *)delay:(NSTimeInterval)seconds onQueue:(SQueue *)queue { SMetaDisposable *disposable = [[SMetaDisposable alloc] init]; - STimer *timer = [[STimer alloc] initWithTimeout:seconds repeat:false completion:^ + STimer *timer = [[STimer alloc] initWithTimeout:seconds repeat:NO completion:^ { [disposable setDisposable:[self startWithNext:^(id next) { @@ -47,7 +47,7 @@ - (SSignal *)timeout:(NSTimeInterval)seconds onQueue:(SQueue *)queue orSignal:(S { SMetaDisposable *disposable = [[SMetaDisposable alloc] init]; - STimer *timer = [[STimer alloc] initWithTimeout:seconds repeat:false completion:^ + STimer *timer = [[STimer alloc] initWithTimeout:seconds repeat:NO completion:^ { [disposable setDisposable:[signal startWithNext:^(id next) { diff --git a/SSignalKit/SSubscriber.m b/SSignalKit/SSubscriber.m index bcd2d59..325b2ac 100644 --- a/SSignalKit/SSubscriber.m +++ b/SSignalKit/SSubscriber.m @@ -29,7 +29,7 @@ @interface SSubscriber () { @protected OSSpinLock _lock; - bool _terminated; + BOOL _terminated; id _disposable; SSubscriberBlocks *_blocks; } @@ -50,10 +50,10 @@ - (instancetype)initWithNext:(void (^)(id))next error:(void (^)(id))error comple - (void)_assignDisposable:(id)disposable { - bool dispose = false; + BOOL dispose = NO; OSSpinLockLock(&_lock); if (_terminated) { - dispose = true; + dispose = YES; } else { _disposable = disposable; } @@ -72,7 +72,7 @@ - (void)_markTerminatedWithoutDisposal blocks = _blocks; _blocks = nil; - _terminated = true; + _terminated = YES; } OSSpinLockUnlock(&_lock); @@ -98,7 +98,7 @@ - (void)putNext:(id)next - (void)putError:(id)error { - bool shouldDispose = false; + BOOL shouldDispose = NO; SSubscriberBlocks *blocks = nil; OSSpinLockLock(&_lock); @@ -107,8 +107,8 @@ - (void)putError:(id)error blocks = _blocks; _blocks = nil; - shouldDispose = true; - _terminated = true; + shouldDispose = YES; + _terminated = YES; } OSSpinLockUnlock(&_lock); @@ -122,7 +122,7 @@ - (void)putError:(id)error - (void)putCompletion { - bool shouldDispose = false; + BOOL shouldDispose = NO; SSubscriberBlocks *blocks = nil; OSSpinLockLock(&_lock); @@ -131,8 +131,8 @@ - (void)putCompletion blocks = _blocks; _blocks = nil; - shouldDispose = true; - _terminated = true; + shouldDispose = YES; + _terminated = YES; } OSSpinLockUnlock(&_lock); @@ -183,7 +183,7 @@ - (void)_markTerminatedWithoutDisposal if (!_terminated) { NSLog(@"trace(%@ terminated)", _name); - _terminated = true; + _terminated = YES; _next = nil; _error = nil; _completed = nil; @@ -211,18 +211,18 @@ - (void)putNext:(id)next - (void)putError:(id)error { - bool shouldDispose = false; + BOOL shouldDispose = NO; void (^ferror)(id) = nil; OSSpinLockLock(&_lock); if (!_terminated) { ferror = self->_error; - shouldDispose = true; + shouldDispose = YES; self->_next = nil; self->_error = nil; self->_completed = nil; - _terminated = true; + _terminated = YES; } OSSpinLockUnlock(&_lock); @@ -240,18 +240,18 @@ - (void)putError:(id)error - (void)putCompletion { - bool shouldDispose = false; + BOOL shouldDispose = NO; void (^completed)() = nil; OSSpinLockLock(&_lock); if (!_terminated) { completed = self->_completed; - shouldDispose = true; + shouldDispose = YES; self->_next = nil; self->_error = nil; self->_completed = nil; - _terminated = true; + _terminated = YES; } OSSpinLockUnlock(&_lock); diff --git a/SSignalKit/SThreadPool.m b/SSignalKit/SThreadPool.m index d6d8150..62ec2f3 100644 --- a/SSignalKit/SThreadPool.m +++ b/SSignalKit/SThreadPool.m @@ -24,7 +24,7 @@ + (void)threadEntryPoint:(SThreadPool *)threadPool { SThreadPoolQueue *queue = nil; - while (true) + while (YES) { SThreadPoolTask *task = nil; @@ -37,7 +37,7 @@ + (void)threadEntryPoint:(SThreadPool *)threadPool [threadPool->_queues addObject:queue]; } - while (true) + while (YES) { while (threadPool->_queues.count == 0) pthread_cond_wait(&threadPool->_cond, &threadPool->_mutex); diff --git a/SSignalKit/SThreadPoolQueue.h b/SSignalKit/SThreadPoolQueue.h index e889a77..c5be9a4 100644 --- a/SSignalKit/SThreadPoolQueue.h +++ b/SSignalKit/SThreadPoolQueue.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN - (instancetype)initWithThreadPool:(SThreadPool *)threadPool; - (void)addTask:(SThreadPoolTask *)task; - (SThreadPoolTask * _Nullable)_popFirstTask; -- (bool)_hasTasks; +- (BOOL)_hasTasks; @end diff --git a/SSignalKit/SThreadPoolQueue.m b/SSignalKit/SThreadPoolQueue.m index bc12f24..e638788 100644 --- a/SSignalKit/SThreadPoolQueue.m +++ b/SSignalKit/SThreadPoolQueue.m @@ -43,7 +43,7 @@ - (SThreadPoolTask *)_popFirstTask return nil; } -- (bool)_hasTasks +- (BOOL)_hasTasks { return _tasks.count != 0; } diff --git a/SSignalKit/SThreadPoolTask.h b/SSignalKit/SThreadPoolTask.h index a70c8e5..bb91c57 100644 --- a/SSignalKit/SThreadPoolTask.h +++ b/SSignalKit/SThreadPoolTask.h @@ -4,7 +4,7 @@ NS_ASSUME_NONNULL_BEGIN @interface SThreadPoolTask : NSObject -- (instancetype)initWithBlock:(void (^)(bool (^)(void)))block; +- (instancetype)initWithBlock:(void (^)(BOOL (^)(void)))block; - (void)execute; - (void)cancel; diff --git a/SSignalKit/SThreadPoolTask.m b/SSignalKit/SThreadPoolTask.m index 98fad6f..e64a635 100644 --- a/SSignalKit/SThreadPoolTask.m +++ b/SSignalKit/SThreadPoolTask.m @@ -3,7 +3,7 @@ @interface SThreadPoolTaskState : NSObject { @public - bool _cancelled; + BOOL _cancelled; } @end @@ -14,7 +14,7 @@ @implementation SThreadPoolTaskState @interface SThreadPoolTask () { - void (^_block)(bool (^)(void)); + void (^_block)(BOOL (^)(void)); SThreadPoolTaskState *_state; } @@ -22,7 +22,7 @@ @interface SThreadPoolTask () @implementation SThreadPoolTask -- (instancetype)initWithBlock:(void (^)(bool (^)(void)))block +- (instancetype)initWithBlock:(void (^)(BOOL (^)(void)))block { self = [super init]; if (self != nil) @@ -39,7 +39,7 @@ - (void)execute return; SThreadPoolTaskState *state = _state; - _block(^bool + _block(^BOOL { return state->_cancelled; }); @@ -47,7 +47,7 @@ - (void)execute - (void)cancel { - _state->_cancelled = true; + _state->_cancelled = YES; } @end diff --git a/SSignalKit/STimer.h b/SSignalKit/STimer.h index e6a8e90..186c01d 100644 --- a/SSignalKit/STimer.h +++ b/SSignalKit/STimer.h @@ -6,8 +6,8 @@ NS_ASSUME_NONNULL_BEGIN @interface STimer : NSObject -- (instancetype)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion queue:(SQueue *)queue; -- (instancetype)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion nativeQueue:(dispatch_queue_t)nativeQueue; +- (instancetype)initWithTimeout:(NSTimeInterval)timeout repeat:(BOOL)repeat completion:(dispatch_block_t)completion queue:(SQueue *)queue; +- (instancetype)initWithTimeout:(NSTimeInterval)timeout repeat:(BOOL)repeat completion:(dispatch_block_t)completion nativeQueue:(dispatch_queue_t)nativeQueue; - (void)start; - (void)invalidate; diff --git a/SSignalKit/STimer.m b/SSignalKit/STimer.m index a382aef..4d7c780 100644 --- a/SSignalKit/STimer.m +++ b/SSignalKit/STimer.m @@ -7,7 +7,7 @@ @interface STimer () dispatch_source_t _timer; NSTimeInterval _timeout; NSTimeInterval _timeoutDate; - bool _repeat; + BOOL _repeat; dispatch_block_t _completion; dispatch_queue_t _nativeQueue; } @@ -16,11 +16,11 @@ @interface STimer () @implementation STimer -- (id)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion queue:(SQueue *)queue { +- (id)initWithTimeout:(NSTimeInterval)timeout repeat:(BOOL)repeat completion:(dispatch_block_t)completion queue:(SQueue *)queue { return [self initWithTimeout:timeout repeat:repeat completion:completion nativeQueue:queue._dispatch_queue]; } -- (id)initWithTimeout:(NSTimeInterval)timeout repeat:(bool)repeat completion:(dispatch_block_t)completion nativeQueue:(dispatch_queue_t)nativeQueue +- (id)initWithTimeout:(NSTimeInterval)timeout repeat:(BOOL)repeat completion:(dispatch_block_t)completion nativeQueue:(dispatch_queue_t)nativeQueue { self = [super init]; if (self != nil) diff --git a/SSignalKit/SVariable.m b/SSignalKit/SVariable.m index dc02ce9..a45f4c9 100644 --- a/SSignalKit/SVariable.m +++ b/SSignalKit/SVariable.m @@ -11,7 +11,7 @@ @interface SVariable () { OSSpinLock _lock; id _value; - bool _hasValue; + BOOL _hasValue; SBag *_subscribers; SMetaDisposable *_disposable; } @@ -42,7 +42,7 @@ - (SSignal *)signal { OSSpinLockLock(&self->_lock); id currentValue = self->_value; - bool hasValue = self->_hasValue; + BOOL hasValue = self->_hasValue; NSInteger index = [self->_subscribers addItem:[^(id value) { [subscriber putNext:value]; @@ -66,7 +66,7 @@ - (SSignal *)signal - (void)set:(SSignal *)signal { OSSpinLockLock(&_lock); - _hasValue = false; + _hasValue = NO; OSSpinLockUnlock(&_lock); __weak SVariable *weakSelf = self; @@ -78,7 +78,7 @@ - (void)set:(SSignal *)signal NSArray *subscribers = nil; OSSpinLockLock(&strongSelf->_lock); strongSelf->_value = next; - strongSelf->_hasValue = true; + strongSelf->_hasValue = YES; subscribers = [strongSelf->_subscribers copyItems]; OSSpinLockUnlock(&strongSelf->_lock); diff --git a/SSignalKitTests/DeallocatingObject.h b/SSignalKitTests/DeallocatingObject.h index 00f3c9c..f25b0f7 100644 --- a/SSignalKitTests/DeallocatingObject.h +++ b/SSignalKitTests/DeallocatingObject.h @@ -2,6 +2,6 @@ @interface DeallocatingObject : NSObject -- (instancetype)initWithDeallocated:(bool *)deallocated; +- (instancetype)initWithDeallocated:(BOOL *)deallocated; @end diff --git a/SSignalKitTests/DeallocatingObject.m b/SSignalKitTests/DeallocatingObject.m index 38cff65..e36f85f 100644 --- a/SSignalKitTests/DeallocatingObject.m +++ b/SSignalKitTests/DeallocatingObject.m @@ -2,14 +2,14 @@ @interface DeallocatingObject () { - bool *_deallocated; + BOOL *_deallocated; } @end @implementation DeallocatingObject -- (instancetype)initWithDeallocated:(bool *)deallocated +- (instancetype)initWithDeallocated:(BOOL *)deallocated { self = [super init]; if (self != nil) @@ -21,7 +21,7 @@ - (instancetype)initWithDeallocated:(bool *)deallocated - (void)dealloc { - *_deallocated = true; + *_deallocated = YES; } @end diff --git a/SSignalKitTests/SDisposableTests.m b/SSignalKitTests/SDisposableTests.m index 397e7c4..5ca1046 100644 --- a/SSignalKitTests/SDisposableTests.m +++ b/SSignalKitTests/SDisposableTests.m @@ -29,13 +29,13 @@ - (void)tearDown - (void)testBlockDisposableDisposed { - bool deallocated = false; - __block bool disposed = false; + BOOL deallocated = NO; + __block BOOL disposed = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; dispatch_block_t block = ^{ [object description]; - disposed = true; + disposed = YES; }; SBlockDisposable *disposable = [[SBlockDisposable alloc] initWithBlock:[block copy]]; object = nil; @@ -49,13 +49,13 @@ - (void)testBlockDisposableDisposed - (void)testBlockDisposableNotDisposed { - bool deallocated = false; - __block bool disposed = false; + BOOL deallocated = NO; + __block BOOL disposed = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; dispatch_block_t block = ^{ [object description]; - disposed = true; + disposed = YES; }; SBlockDisposable *disposable = [[SBlockDisposable alloc] initWithBlock:[block copy]]; [disposable description]; @@ -67,13 +67,13 @@ - (void)testBlockDisposableNotDisposed - (void)testMetaDisposableDisposed { - bool deallocated = false; - __block bool disposed = false; + BOOL deallocated = NO; + __block BOOL disposed = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; dispatch_block_t block = ^{ [object description]; - disposed = true; + disposed = YES; }; SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]]; @@ -88,22 +88,22 @@ - (void)testMetaDisposableDisposed - (void)testMetaDisposableDisposedMultipleTimes { - bool deallocated1 = false; - __block bool disposed1 = false; - bool deallocated2 = false; - __block bool disposed2 = false; + BOOL deallocated1 = NO; + __block BOOL disposed1 = NO; + BOOL deallocated2 = NO; + __block BOOL disposed2 = NO; { DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1]; dispatch_block_t block1 = ^{ [object1 description]; - disposed1 = true; + disposed1 = YES; }; SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]]; DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2]; dispatch_block_t block2 = ^{ [object2 description]; - disposed2 = true; + disposed2 = YES; }; SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]]; @@ -121,13 +121,13 @@ - (void)testMetaDisposableDisposedMultipleTimes - (void)testMetaDisposableNotDisposed { - bool deallocated = false; - __block bool disposed = false; + BOOL deallocated = NO; + __block BOOL disposed = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; dispatch_block_t block = ^{ [object description]; - disposed = true; + disposed = YES; }; SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]]; @@ -141,13 +141,13 @@ - (void)testMetaDisposableNotDisposed - (void)testDisposableSetSingleDisposed { - bool deallocated = false; - __block bool disposed = false; + BOOL deallocated = NO; + __block BOOL disposed = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; dispatch_block_t block = ^{ [object description]; - disposed = true; + disposed = YES; }; SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]]; @@ -162,22 +162,22 @@ - (void)testDisposableSetSingleDisposed - (void)testDisposableSetMultipleDisposed { - bool deallocated1 = false; - __block bool disposed1 = false; - bool deallocated2 = false; - __block bool disposed2 = false; + BOOL deallocated1 = NO; + __block BOOL disposed1 = NO; + BOOL deallocated2 = NO; + __block BOOL disposed2 = NO; { DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1]; dispatch_block_t block1 = ^{ [object1 description]; - disposed1 = true; + disposed1 = YES; }; SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]]; DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2]; dispatch_block_t block2 = ^{ [object2 description]; - disposed2 = true; + disposed2 = YES; }; SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]]; @@ -195,13 +195,13 @@ - (void)testDisposableSetMultipleDisposed - (void)testDisposableSetSingleNotDisposed { - bool deallocated = false; - __block bool disposed = false; + BOOL deallocated = NO; + __block BOOL disposed = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; dispatch_block_t block = ^{ [object description]; - disposed = true; + disposed = YES; }; SBlockDisposable *blockDisposable = [[SBlockDisposable alloc] initWithBlock:[block copy]]; @@ -215,22 +215,22 @@ - (void)testDisposableSetSingleNotDisposed - (void)testDisposableSetMultipleNotDisposed { - bool deallocated1 = false; - __block bool disposed1 = false; - bool deallocated2 = false; - __block bool disposed2 = false; + BOOL deallocated1 = NO; + __block BOOL disposed1 = NO; + BOOL deallocated2 = NO; + __block BOOL disposed2 = NO; { DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1]; dispatch_block_t block1 = ^{ [object1 description]; - disposed1 = true; + disposed1 = YES; }; SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]]; DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2]; dispatch_block_t block2 = ^{ [object2 description]; - disposed2 = true; + disposed2 = YES; }; SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]]; @@ -247,24 +247,24 @@ - (void)testDisposableSetMultipleNotDisposed - (void)testMetaDisposableAlreadyDisposed { - bool deallocated1 = false; - __block bool disposed1 = false; - bool deallocated2 = false; - __block bool disposed2 = false; + BOOL deallocated1 = NO; + __block BOOL disposed1 = NO; + BOOL deallocated2 = NO; + __block BOOL disposed2 = NO; @autoreleasepool { DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1]; dispatch_block_t block1 = ^{ [object1 description]; - disposed1 = true; + disposed1 = YES; }; SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]]; DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2]; dispatch_block_t block2 = ^{ [object2 description]; - disposed2 = true; + disposed2 = YES; }; SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]]; @@ -282,24 +282,24 @@ - (void)testMetaDisposableAlreadyDisposed - (void)testDisposableSetAlreadyDisposed { - bool deallocated1 = false; - __block bool disposed1 = false; - bool deallocated2 = false; - __block bool disposed2 = false; + BOOL deallocated1 = NO; + __block BOOL disposed1 = NO; + BOOL deallocated2 = NO; + __block BOOL disposed2 = NO; @autoreleasepool { DeallocatingObject *object1 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated1]; dispatch_block_t block1 = ^{ [object1 description]; - disposed1 = true; + disposed1 = YES; }; SBlockDisposable *blockDisposable1 = [[SBlockDisposable alloc] initWithBlock:[block1 copy]]; DeallocatingObject *object2 = [[DeallocatingObject alloc] initWithDeallocated:&deallocated2]; dispatch_block_t block2 = ^{ [object2 description]; - disposed2 = true; + disposed2 = YES; }; SBlockDisposable *blockDisposable2 = [[SBlockDisposable alloc] initWithBlock:[block2 copy]]; diff --git a/SSignalKitTests/SSignalBasicTests.m b/SSignalKitTests/SSignalBasicTests.m index eeb317a..f2c4376 100644 --- a/SSignalKitTests/SSignalBasicTests.m +++ b/SSignalKitTests/SSignalBasicTests.m @@ -52,9 +52,9 @@ - (void)tearDown - (void)testSignalGenerated { - __block bool deallocated = false; - __block bool disposed = false; - __block bool generated = false; + __block BOOL deallocated = NO; + __block BOOL disposed = NO; + __block BOOL generated = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; @@ -66,12 +66,12 @@ - (void)testSignalGenerated return [[SBlockDisposable alloc] initWithBlock:^ { [object description]; - disposed = true; + disposed = YES; }]; }]; id disposable = [signal startWithNext:^(__unused id next) { - generated = true; + generated = YES; [object description]; } error:nil completed:nil]; [disposable dispose]; @@ -84,10 +84,10 @@ - (void)testSignalGenerated - (void)testSignalGeneratedCompleted { - __block bool deallocated = false; - __block bool disposed = false; - __block bool generated = false; - __block bool completed = false; + __block BOOL deallocated = NO; + __block BOOL disposed = NO; + __block BOOL generated = NO; + __block BOOL completed = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; @@ -100,17 +100,17 @@ - (void)testSignalGeneratedCompleted return [[SBlockDisposable alloc] initWithBlock:^ { [object description]; - disposed = true; + disposed = YES; }]; }]; id disposable = [signal startWithNext:^(__unused id next) { [object description]; - generated = true; + generated = YES; } error:nil completed:^ { [object description]; - completed = true; + completed = YES; }]; [disposable dispose]; } @@ -123,10 +123,10 @@ - (void)testSignalGeneratedCompleted - (void)testSignalGeneratedError { - __block bool deallocated = false; - __block bool disposed = false; - __block bool generated = false; - __block bool error = false; + __block BOOL deallocated = NO; + __block BOOL disposed = NO; + __block BOOL generated = NO; + __block BOOL error = NO; { DeallocatingObject *object = [[DeallocatingObject alloc] initWithDeallocated:&deallocated]; @@ -139,15 +139,15 @@ - (void)testSignalGeneratedError return [[SBlockDisposable alloc] initWithBlock:^ { [object description]; - disposed = true; + disposed = YES; }]; }]; id disposable = [signal startWithNext:^(__unused id next) { - generated = true; + generated = YES; } error:^(__unused id value) { - error = true; + error = YES; } completed:nil]; [disposable dispose]; } @@ -160,9 +160,9 @@ - (void)testSignalGeneratedError - (void)testMap { - bool deallocated = false; - __block bool disposed = false; - __block bool generated = false; + BOOL deallocated = NO; + __block BOOL disposed = NO; + __block BOOL generated = NO; { @autoreleasepool @@ -175,7 +175,7 @@ - (void)testMap return [[SBlockDisposable alloc] initWithBlock:^ { [object description]; - disposed = true; + disposed = YES; }]; }] map:^id(id value) { @@ -198,8 +198,8 @@ - (void)testMap - (void)testSubscriberDisposal { - __block bool disposed = false; - __block bool generated = false; + __block BOOL disposed = NO; + __block BOOL generated = NO; dispatch_queue_t queue = dispatch_queue_create(NULL, 0); @@ -215,13 +215,13 @@ - (void)testSubscriberDisposal return [[SBlockDisposable alloc] initWithBlock:^ { - disposed = true; + disposed = YES; }]; }]; id disposable = [signal startWithNext:^(id value) { - generated = true; + generated = YES; } error:nil completed:nil]; NSLog(@"dispose"); [disposable dispose]; @@ -237,31 +237,31 @@ - (void)testSubscriberDisposal - (void)testThen { - __block bool generatedFirst = false; - __block bool disposedFirst = false; - __block bool generatedSecond = false; - __block bool disposedSecond = false; + __block BOOL generatedFirst = NO; + __block BOOL disposedFirst = NO; + __block BOOL generatedSecond = NO; + __block BOOL disposedSecond = NO; __block int result = 0; SSignal *signal = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - generatedFirst = true; + generatedFirst = YES; [subscriber putNext:@(1)]; [subscriber putCompletion]; return [[SBlockDisposable alloc] initWithBlock:^ { - disposedFirst = true; + disposedFirst = YES; }]; }]; signal = [signal then:[[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - generatedSecond = true; + generatedSecond = YES; [subscriber putNext:@(2)]; [subscriber putCompletion]; return [[SBlockDisposable alloc] initWithBlock:^ { - disposedSecond = true; + disposedSecond = YES; }]; }]]; @@ -280,14 +280,14 @@ - (void)testThen - (void)testSwitchToLatest { __block int result = 0; - __block bool disposedOne = false; - __block bool disposedTwo = false; - __block bool disposedThree = false; - __block bool completedAll = false; + __block BOOL disposedOne = NO; + __block BOOL disposedTwo = NO; + __block BOOL disposedThree = NO; + __block BOOL completedAll = NO; - bool deallocatedOne = false; - bool deallocatedTwo = false; - bool deallocatedThree = false; + BOOL deallocatedOne = NO; + BOOL deallocatedTwo = NO; + BOOL deallocatedThree = NO; @autoreleasepool { @@ -303,7 +303,7 @@ - (void)testSwitchToLatest return [[SBlockDisposable alloc] initWithBlock:^ { __unused id a0 = [objectOne description]; - disposedOne = true; + disposedOne = YES; }]; }]; SSignal *two = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) @@ -314,7 +314,7 @@ - (void)testSwitchToLatest return [[SBlockDisposable alloc] initWithBlock:^ { __unused id a1 = [objectOne description]; - disposedTwo = true; + disposedTwo = YES; }]; }]; SSignal *three = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) @@ -325,7 +325,7 @@ - (void)testSwitchToLatest return [[SBlockDisposable alloc] initWithBlock:^ { __unused id a1 = [objectOne description]; - disposedThree = true; + disposedThree = YES; }]; }]; @@ -335,7 +335,7 @@ - (void)testSwitchToLatest result += [next intValue]; } error:nil completed:^ { - completedAll = true; + completedAll = YES; }]; } @@ -351,7 +351,7 @@ - (void)testSwitchToLatest - (void)testSwitchToLatestError { - __block bool errorGenerated = false; + __block BOOL errorGenerated = NO; SSignal *one = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { @@ -364,7 +364,7 @@ - (void)testSwitchToLatestError } error:^(__unused id error) { - errorGenerated = true; + errorGenerated = YES; } completed:^ { @@ -375,7 +375,7 @@ - (void)testSwitchToLatestError - (void)testSwitchToLatestCompleted { - __block bool completedAll = false; + __block BOOL completedAll = NO; SSignal *one = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { @@ -390,7 +390,7 @@ - (void)testSwitchToLatestCompleted { } completed:^ { - completedAll = true; + completedAll = YES; }]; XCTAssertTrue(completedAll); @@ -400,9 +400,9 @@ - (void)testQueue { dispatch_queue_t queue = dispatch_queue_create(NULL, 0); - __block bool disposedFirst = false; - __block bool disposedSecond = false; - __block bool disposedThird = false; + __block BOOL disposedFirst = NO; + __block BOOL disposedSecond = NO; + __block BOOL disposedThird = NO; __block int result = 0; SSignal *firstSignal = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) @@ -416,7 +416,7 @@ - (void)testQueue return [[SBlockDisposable alloc] initWithBlock:^ { - disposedFirst = true; + disposedFirst = YES; }]; }]; @@ -431,7 +431,7 @@ - (void)testQueue return [[SBlockDisposable alloc] initWithBlock:^ { - disposedSecond = true; + disposedSecond = YES; }]; }]; @@ -446,7 +446,7 @@ - (void)testQueue return [[SBlockDisposable alloc] initWithBlock:^ { - disposedThird = true; + disposedThird = YES; }]; }]; @@ -468,10 +468,10 @@ - (void)testQueueInterrupted { dispatch_queue_t queue = dispatch_queue_create(NULL, 0); - __block bool disposedFirst = false; - __block bool disposedSecond = false; - __block bool disposedThird = false; - __block bool startedThird = false; + __block BOOL disposedFirst = NO; + __block BOOL disposedSecond = NO; + __block BOOL disposedThird = NO; + __block BOOL startedThird = NO; __block int result = 0; SSignal *firstSignal = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) @@ -485,7 +485,7 @@ - (void)testQueueInterrupted return [[SBlockDisposable alloc] initWithBlock:^ { - disposedFirst = true; + disposedFirst = YES; }]; }]; @@ -500,13 +500,13 @@ - (void)testQueueInterrupted return [[SBlockDisposable alloc] initWithBlock:^ { - disposedSecond = true; + disposedSecond = YES; }]; }]; SSignal *thirdSignal = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - startedThird = true; + startedThird = YES; dispatch_async(queue, ^ { @@ -517,7 +517,7 @@ - (void)testQueueInterrupted return [[SBlockDisposable alloc] initWithBlock:^ { - disposedThird = true; + disposedThird = YES; }]; }]; @@ -540,19 +540,19 @@ - (void)testQueueDisposed { dispatch_queue_t queue = dispatch_queue_create(NULL, 0); - __block bool disposedFirst = false; - __block bool disposedSecond = false; - __block bool disposedThird = false; - __block bool startedFirst = false; - __block bool startedSecond = false; - __block bool startedThird = false; + __block BOOL disposedFirst = NO; + __block BOOL disposedSecond = NO; + __block BOOL disposedThird = NO; + __block BOOL startedFirst = NO; + __block BOOL startedSecond = NO; + __block BOOL startedThird = NO; __block int result = 0; SSignal *firstSignal = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - startedFirst = true; + startedFirst = YES; - __block bool cancelled = false; + __block BOOL cancelled = NO; dispatch_async(queue, ^ { if (!cancelled) @@ -565,16 +565,16 @@ - (void)testQueueDisposed return [[SBlockDisposable alloc] initWithBlock:^ { - cancelled = true; - disposedFirst = true; + cancelled = YES; + disposedFirst = YES; }]; }]; SSignal *secondSignal = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - startedSecond = true; + startedSecond = YES; - __block bool cancelled = false; + __block BOOL cancelled = NO; dispatch_async(queue, ^ { if (!cancelled) @@ -587,14 +587,14 @@ - (void)testQueueDisposed return [[SBlockDisposable alloc] initWithBlock:^ { - cancelled = true; - disposedSecond = true; + cancelled = YES; + disposedSecond = YES; }]; }]; SSignal *thirdSignal = [[SSignal alloc] initWithGenerator:^id(SSubscriber *subscriber) { - startedThird = true; + startedThird = YES; dispatch_async(queue, ^ { @@ -605,7 +605,7 @@ - (void)testQueueDisposed return [[SBlockDisposable alloc] initWithBlock:^ { - disposedThird = true; + disposedThird = YES; }]; }]; @@ -703,8 +703,8 @@ - (void)testDisposableDeadlock { } - (void)testRetryIfNoError { - SSignal *s = [[SSignal single:@1] retryIf:^bool(__unused id error) { - return true; + SSignal *s = [[SSignal single:@1] retryIf:^BOOL(__unused id error) { + return YES; }]; [s startWithNext:^(id next) { XCTAssertEqual(next, @1); @@ -712,8 +712,8 @@ - (void)testRetryIfNoError { } - (void)testRetryErrorNoMatch { - SSignal *s = [[SSignal fail:@false] retryIf:^bool(id error) { - return false; + SSignal *s = [[SSignal fail:@NO] retryIf:^BOOL(id error) { + return NO; }]; } @@ -722,12 +722,12 @@ - (void)testRetryErrorMatch { SSignal *s = [[[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { if (counter == 1) { counter++; - [subscriber putError:@true]; + [subscriber putError:@YES]; } else { [subscriber putNext:@(counter)]; } return nil; - }] retryIf:^bool(id error) { + }] retryIf:^BOOL(id error) { return [error boolValue]; }]; @@ -744,16 +744,16 @@ - (void)testRetryErrorFailNoMatch { SSignal *s = [[[SSignal alloc] initWithGenerator:^id (SSubscriber *subscriber) { if (counter == 1) { counter++; - [subscriber putError:@true]; + [subscriber putError:@YES]; } else { - [subscriber putError:@false]; + [subscriber putError:@NO]; } return nil; - }] retryIf:^bool(id error) { + }] retryIf:^BOOL(id error) { return [error boolValue]; }]; - __block bool errorMatches = false; + __block BOOL errorMatches = NO; [s startWithNext:nil error:^(id error) { errorMatches = ![error boolValue]; } completed:nil];