From 80b5165266fa56d3a7a2052a5e6bbbf6ed67e0db Mon Sep 17 00:00:00 2001 From: Jakub Olejnik Date: Wed, 13 Mar 2024 12:33:14 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A5=20Remove=20AlamofireImage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project.pbxproj | 462 ------------------ ...activeExtensions - AlamofireImage.xcscheme | 76 --- .../Supporting files/AlamofireImage.h | 18 - .../Supporting files/Info.plist | 24 - CHANGELOG.md | 1 + Cartfile | 1 - Cartfile.resolved | 4 +- .../AlamofireImageExtensions.swift | 0 .../ImageDownloaderExtensions.swift | 0 Package.resolved | 18 - Package.swift | 67 ++- 11 files changed, 54 insertions(+), 617 deletions(-) delete mode 100644 ACKReactiveExtensions.xcodeproj/xcshareddata/xcschemes/ACKReactiveExtensions - AlamofireImage.xcscheme delete mode 100644 ACKReactiveExtensions/AlamofireImage/Supporting files/AlamofireImage.h delete mode 100644 ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist rename {ACKReactiveExtensions => Deprecated}/AlamofireImage/AlamofireImageExtensions.swift (100%) rename {ACKReactiveExtensions => Deprecated}/AlamofireImage/ImageDownloaderExtensions.swift (100%) diff --git a/ACKReactiveExtensions.xcodeproj/project.pbxproj b/ACKReactiveExtensions.xcodeproj/project.pbxproj index d3946b2..355c81c 100644 --- a/ACKReactiveExtensions.xcodeproj/project.pbxproj +++ b/ACKReactiveExtensions.xcodeproj/project.pbxproj @@ -27,13 +27,6 @@ 0E1CD6342799988B007B7405 /* ReactiveSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD62C2799986A007B7405 /* ReactiveSwift.xcframework */; }; 0E1CD637279998C7007B7405 /* ReactiveCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD62B2799986A007B7405 /* ReactiveCocoa.xcframework */; }; 0E1CD639279998C7007B7405 /* ReactiveSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD62C2799986A007B7405 /* ReactiveSwift.xcframework */; }; - 0E1CD63C279998E2007B7405 /* ReactiveCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD62B2799986A007B7405 /* ReactiveCocoa.xcframework */; }; - 0E1CD63E279998E2007B7405 /* ReactiveSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD62C2799986A007B7405 /* ReactiveSwift.xcframework */; }; - 0E1CD642279998E2007B7405 /* Marshal.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD641279998E2007B7405 /* Marshal.xcframework */; }; - 0E1CD64927999913007B7405 /* ReactiveCocoa.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD62B2799986A007B7405 /* ReactiveCocoa.xcframework */; }; - 0E1CD64B27999914007B7405 /* ReactiveSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD62C2799986A007B7405 /* ReactiveSwift.xcframework */; }; - 0E1CD65027999914007B7405 /* AlamofireImage.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD64E27999914007B7405 /* AlamofireImage.xcframework */; }; - 0E1CD65227999914007B7405 /* Alamofire.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0E1CD64F27999914007B7405 /* Alamofire.xcframework */; }; 690568FD24D8531400AE9F45 /* Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 690568FC24D8531400AE9F45 /* Codable.swift */; }; 690C440F2141870000C39F46 /* UIImageViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 690C440D214186E600C39F46 /* UIImageViewExtensions.swift */; }; 691F8596202A106600DA4FAD /* UIControlExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 691F8595202A106600DA4FAD /* UIControlExtensions.swift */; }; @@ -50,12 +43,7 @@ 699B58ED1FF52DD700FFDC91 /* WKWebViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 699B58EC1FF52DD600FFDC91 /* WKWebViewExtensions.swift */; }; 699B58F81FF52F0600FFDC91 /* ACKReactiveExtensionsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 699B583F1FF526A000FFDC91 /* ACKReactiveExtensionsCore.framework */; }; 699B58F91FF52F0E00FFDC91 /* ACKReactiveExtensionsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 699B583F1FF526A000FFDC91 /* ACKReactiveExtensionsCore.framework */; }; - 699B59011FF52F3300FFDC91 /* ACKReactiveExtensionsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 699B583F1FF526A000FFDC91 /* ACKReactiveExtensionsCore.framework */; }; 699C4F872083892300AEEAA1 /* UITableViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 699C4F862083892300AEEAA1 /* UITableViewExtensions.swift */; }; - 699C4F9120838B6300AEEAA1 /* AlamofireImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 699C4F8F20838B6300AEEAA1 /* AlamofireImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 699C4F9620838BB700AEEAA1 /* AlamofireImageExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 699C4F9520838BB700AEEAA1 /* AlamofireImageExtensions.swift */; }; - 699C4F9C20838C4500AEEAA1 /* ACKReactiveExtensionsCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 699B583F1FF526A000FFDC91 /* ACKReactiveExtensionsCore.framework */; }; - 699C4F9E20838EB600AEEAA1 /* ImageDownloaderExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 699C4F9D20838EB600AEEAA1 /* ImageDownloaderExtensions.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -66,13 +54,6 @@ remoteGlobalIDString = 69836755249899670047C995; remoteInfo = Swiftlint; }; - 6983675C2498999E0047C995 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 690B9FB01FF526770098BEC6 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 69836755249899670047C995; - remoteInfo = Swiftlint; - }; 699B58F61FF52EFB00FFDC91 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 690B9FB01FF526770098BEC6 /* Project object */; @@ -87,13 +68,6 @@ remoteGlobalIDString = 699B583E1FF526A000FFDC91; remoteInfo = Core; }; - 699B58FF1FF52F2F00FFDC91 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 690B9FB01FF526770098BEC6 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 699B583E1FF526A000FFDC91; - remoteInfo = Core; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -122,7 +96,6 @@ 699B583F1FF526A000FFDC91 /* ACKReactiveExtensionsCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ACKReactiveExtensionsCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 699B584D1FF526B100FFDC91 /* ACKReactiveExtensionsUIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ACKReactiveExtensionsUIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 699B585A1FF526B900FFDC91 /* ACKReactiveExtensionsWebKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ACKReactiveExtensionsWebKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 699B58741FF526CB00FFDC91 /* ACKReactiveExtensionsMarshal.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ACKReactiveExtensionsMarshal.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 699B58A81FF5273C00FFDC91 /* Core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Core.h; sourceTree = ""; }; 699B58A91FF5273C00FFDC91 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 699B58B71FF5273C00FFDC91 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -144,13 +117,8 @@ 699B59171FF5305F00FFDC91 /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Realm.framework; path = Carthage/Build/iOS/Realm.framework; sourceTree = ""; }; 699B591B1FF53A0800FFDC91 /* Reachability.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reachability.framework; path = Carthage/Build/iOS/Reachability.framework; sourceTree = ""; }; 699C4F862083892300AEEAA1 /* UITableViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITableViewExtensions.swift; sourceTree = ""; }; - 699C4F8D20838B6300AEEAA1 /* ACKReactiveExtensionsAlamofireImage.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ACKReactiveExtensionsAlamofireImage.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 699C4F8F20838B6300AEEAA1 /* AlamofireImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AlamofireImage.h; sourceTree = ""; }; - 699C4F9020838B6300AEEAA1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 699C4F9520838BB700AEEAA1 /* AlamofireImageExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImageExtensions.swift; sourceTree = ""; }; 699C4F9820838C0900AEEAA1 /* AlamofireImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AlamofireImage.framework; path = Carthage/Build/iOS/AlamofireImage.framework; sourceTree = ""; }; 699C4F9920838C0900AEEAA1 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Alamofire.framework; path = Carthage/Build/iOS/Alamofire.framework; sourceTree = ""; }; - 699C4F9D20838EB600AEEAA1 /* ImageDownloaderExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageDownloaderExtensions.swift; sourceTree = ""; }; 69BDC494201A477700591992 /* Cartfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = Cartfile; sourceTree = ""; }; /* End PBXFileReference section */ @@ -184,29 +152,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 699B58701FF526CB00FFDC91 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 0E1CD63C279998E2007B7405 /* ReactiveCocoa.xcframework in Frameworks */, - 699B59011FF52F3300FFDC91 /* ACKReactiveExtensionsCore.framework in Frameworks */, - 0E1CD642279998E2007B7405 /* Marshal.xcframework in Frameworks */, - 0E1CD63E279998E2007B7405 /* ReactiveSwift.xcframework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 699C4F8920838B6300AEEAA1 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 0E1CD65227999914007B7405 /* Alamofire.xcframework in Frameworks */, - 0E1CD65027999914007B7405 /* AlamofireImage.xcframework in Frameworks */, - 0E1CD64927999913007B7405 /* ReactiveCocoa.xcframework in Frameworks */, - 699C4F9C20838C4500AEEAA1 /* ACKReactiveExtensionsCore.framework in Frameworks */, - 0E1CD64B27999914007B7405 /* ReactiveSwift.xcframework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -226,8 +171,6 @@ 699B583F1FF526A000FFDC91 /* ACKReactiveExtensionsCore.framework */, 699B584D1FF526B100FFDC91 /* ACKReactiveExtensionsUIKit.framework */, 699B585A1FF526B900FFDC91 /* ACKReactiveExtensionsWebKit.framework */, - 699B58741FF526CB00FFDC91 /* ACKReactiveExtensionsMarshal.framework */, - 699C4F8D20838B6300AEEAA1 /* ACKReactiveExtensionsAlamofireImage.framework */, ); name = Products; sourceTree = ""; @@ -235,7 +178,6 @@ 699B58A31FF5273C00FFDC91 /* ACKReactiveExtensions */ = { isa = PBXGroup; children = ( - 699C4F8E20838B6300AEEAA1 /* AlamofireImage */, 699B58A71FF5273C00FFDC91 /* Core */, 699B58B61FF5273C00FFDC91 /* UIKit */, 699B58B91FF5273C00FFDC91 /* WebKit */, @@ -340,25 +282,6 @@ name = Frameworks; sourceTree = ""; }; - 699C4F8E20838B6300AEEAA1 /* AlamofireImage */ = { - isa = PBXGroup; - children = ( - 699C4F9520838BB700AEEAA1 /* AlamofireImageExtensions.swift */, - 699C4F9D20838EB600AEEAA1 /* ImageDownloaderExtensions.swift */, - 699C4F9720838BBE00AEEAA1 /* Supporting files */, - ); - path = AlamofireImage; - sourceTree = ""; - }; - 699C4F9720838BBE00AEEAA1 /* Supporting files */ = { - isa = PBXGroup; - children = ( - 699C4F8F20838B6300AEEAA1 /* AlamofireImage.h */, - 699C4F9020838B6300AEEAA1 /* Info.plist */, - ); - path = "Supporting files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -383,21 +306,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 699B58711FF526CB00FFDC91 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 699C4F8A20838B6300AEEAA1 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 699C4F9120838B6300AEEAA1 /* AlamofireImage.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -458,44 +366,6 @@ productReference = 699B585A1FF526B900FFDC91 /* ACKReactiveExtensionsWebKit.framework */; productType = "com.apple.product-type.framework"; }; - 699B58731FF526CB00FFDC91 /* Marshal */ = { - isa = PBXNativeTarget; - buildConfigurationList = 699B58791FF526CB00FFDC91 /* Build configuration list for PBXNativeTarget "Marshal" */; - buildPhases = ( - 699B586F1FF526CB00FFDC91 /* Sources */, - 699B58701FF526CB00FFDC91 /* Frameworks */, - 699B58711FF526CB00FFDC91 /* Headers */, - 699B58721FF526CB00FFDC91 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 699B59001FF52F2F00FFDC91 /* PBXTargetDependency */, - ); - name = Marshal; - productName = Marshal; - productReference = 699B58741FF526CB00FFDC91 /* ACKReactiveExtensionsMarshal.framework */; - productType = "com.apple.product-type.framework"; - }; - 699C4F8C20838B6300AEEAA1 /* AlamofireImage */ = { - isa = PBXNativeTarget; - buildConfigurationList = 699C4F9420838B6300AEEAA1 /* Build configuration list for PBXNativeTarget "AlamofireImage" */; - buildPhases = ( - 699C4F8820838B6300AEEAA1 /* Sources */, - 699C4F8920838B6300AEEAA1 /* Frameworks */, - 699C4F8A20838B6300AEEAA1 /* Headers */, - 699C4F8B20838B6300AEEAA1 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 6983675D2498999E0047C995 /* PBXTargetDependency */, - ); - name = AlamofireImage; - productName = AlamofireImage; - productReference = 699C4F8D20838B6300AEEAA1 /* ACKReactiveExtensionsAlamofireImage.framework */; - productType = "com.apple.product-type.framework"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -523,16 +393,6 @@ LastSwiftMigration = ""; ProvisioningStyle = Manual; }; - 699B58731FF526CB00FFDC91 = { - CreatedOnToolsVersion = 9.2; - LastSwiftMigration = ""; - ProvisioningStyle = Manual; - }; - 699C4F8C20838B6300AEEAA1 = { - CreatedOnToolsVersion = 9.3; - LastSwiftMigration = ""; - ProvisioningStyle = Manual; - }; }; }; buildConfigurationList = 690B9FB31FF526770098BEC6 /* Build configuration list for PBXProject "ACKReactiveExtensions" */; @@ -551,8 +411,6 @@ 699B583E1FF526A000FFDC91 /* Core */, 699B584C1FF526B100FFDC91 /* UIKit */, 699B58591FF526B900FFDC91 /* WebKit */, - 699B58731FF526CB00FFDC91 /* Marshal */, - 699C4F8C20838B6300AEEAA1 /* AlamofireImage */, 69836755249899670047C995 /* Swiftlint */, ); }; @@ -580,20 +438,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 699B58721FF526CB00FFDC91 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 699C4F8B20838B6300AEEAA1 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -654,22 +498,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 699B586F1FF526CB00FFDC91 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 699C4F8820838B6300AEEAA1 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 699C4F9E20838EB600AEEAA1 /* ImageDownloaderExtensions.swift in Sources */, - 699C4F9620838BB700AEEAA1 /* AlamofireImageExtensions.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -678,11 +506,6 @@ target = 69836755249899670047C995 /* Swiftlint */; targetProxy = 6983675A249899950047C995 /* PBXContainerItemProxy */; }; - 6983675D2498999E0047C995 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 69836755249899670047C995 /* Swiftlint */; - targetProxy = 6983675C2498999E0047C995 /* PBXContainerItemProxy */; - }; 699B58F71FF52EFB00FFDC91 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 699B583E1FF526A000FFDC91 /* Core */; @@ -693,11 +516,6 @@ target = 699B583E1FF526A000FFDC91 /* Core */; targetProxy = 699B58FA1FF52F1700FFDC91 /* PBXContainerItemProxy */; }; - 699B59001FF52F2F00FFDC91 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 699B583E1FF526A000FFDC91 /* Core */; - targetProxy = 699B58FF1FF52F2F00FFDC91 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -1252,268 +1070,6 @@ }; name = Release; }; - 699B587A1FF526CB00FFDC91 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - 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_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/ACKReactiveExtensions/Marshal/Supporting files/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; - PRODUCT_BUNDLE_IDENTIFIER = cz.ackee.Marshal; - PRODUCT_MODULE_NAME = ACKReactiveExtensionsMarshal; - PRODUCT_NAME = ACKReactiveExtensionsMarshal; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 699B587B1FF526CB00FFDC91 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - 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_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - 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_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - INFOPLIST_FILE = "$(SRCROOT)/ACKReactiveExtensions/Marshal/Supporting files/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = cz.ackee.Marshal; - PRODUCT_MODULE_NAME = ACKReactiveExtensionsMarshal; - PRODUCT_NAME = ACKReactiveExtensionsMarshal; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; - 699C4F9220838B6300AEEAA1 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "$(SRCROOT)/ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = cz.ackee.AlamofireImage; - PRODUCT_MODULE_NAME = ACKReactiveExtensionsAlamofireImage; - PRODUCT_NAME = ACKReactiveExtensionsAlamofireImage; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 699C4F9320838B6300AEEAA1 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "$(SRCROOT)/ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = cz.ackee.AlamofireImage; - PRODUCT_MODULE_NAME = ACKReactiveExtensionsAlamofireImage; - PRODUCT_NAME = ACKReactiveExtensionsAlamofireImage; - PROVISIONING_PROFILE_SPECIFIER = ""; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1562,24 +1118,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 699B58791FF526CB00FFDC91 /* Build configuration list for PBXNativeTarget "Marshal" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 699B587A1FF526CB00FFDC91 /* Debug */, - 699B587B1FF526CB00FFDC91 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 699C4F9420838B6300AEEAA1 /* Build configuration list for PBXNativeTarget "AlamofireImage" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 699C4F9220838B6300AEEAA1 /* Debug */, - 699C4F9320838B6300AEEAA1 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 690B9FB01FF526770098BEC6 /* Project object */; diff --git a/ACKReactiveExtensions.xcodeproj/xcshareddata/xcschemes/ACKReactiveExtensions - AlamofireImage.xcscheme b/ACKReactiveExtensions.xcodeproj/xcshareddata/xcschemes/ACKReactiveExtensions - AlamofireImage.xcscheme deleted file mode 100644 index 9596223..0000000 --- a/ACKReactiveExtensions.xcodeproj/xcshareddata/xcschemes/ACKReactiveExtensions - AlamofireImage.xcscheme +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ACKReactiveExtensions/AlamofireImage/Supporting files/AlamofireImage.h b/ACKReactiveExtensions/AlamofireImage/Supporting files/AlamofireImage.h deleted file mode 100644 index bed9e81..0000000 --- a/ACKReactiveExtensions/AlamofireImage/Supporting files/AlamofireImage.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// AlamofireImage.h -// AlamofireImage -// -// Created by Jakub Olejník on 15/04/2018. -// - -#import - -//! Project version number for AlamofireImage. -FOUNDATION_EXPORT double AlamofireImageVersionNumber; - -//! Project version string for AlamofireImage. -FOUNDATION_EXPORT const unsigned char AlamofireImageVersionString[]; - -// In this header, you should import all the public headers of your framework using statements like #import - - diff --git a/ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist b/ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist deleted file mode 100644 index fcd3639..0000000 --- a/ACKReactiveExtensions/AlamofireImage/Supporting files/Info.plist +++ /dev/null @@ -1,24 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - FMWK - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - - - diff --git a/CHANGELOG.md b/CHANGELOG.md index 10d867a..08846be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ## master +- remove AlamofireImage extensions, moved to [Deprecated/AlamofireImage] for users relying on it (#62, kudos to @olejnjak) - use Xcode 15.2 on CI ➡️ bump deployment target to iOS 12 (#61, kudos to @olejnjak) # 6.2.0 diff --git a/Cartfile b/Cartfile index f0ebcba..affbb76 100644 --- a/Cartfile +++ b/Cartfile @@ -1,3 +1,2 @@ github "ReactiveCocoa/ReactiveCocoa" ~> 12.0 github "ReactiveCocoa/ReactiveSwift" ~> 7.0 -github "Alamofire/AlamofireImage" ~> 4.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 4b3e7af..dabf0ae 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1,4 +1,2 @@ -github "Alamofire/Alamofire" "5.6.4" -github "Alamofire/AlamofireImage" "4.2.0" github "ReactiveCocoa/ReactiveCocoa" "12.0.0" -github "ReactiveCocoa/ReactiveSwift" "7.0.0" +github "ReactiveCocoa/ReactiveSwift" "7.1.1" diff --git a/ACKReactiveExtensions/AlamofireImage/AlamofireImageExtensions.swift b/Deprecated/AlamofireImage/AlamofireImageExtensions.swift similarity index 100% rename from ACKReactiveExtensions/AlamofireImage/AlamofireImageExtensions.swift rename to Deprecated/AlamofireImage/AlamofireImageExtensions.swift diff --git a/ACKReactiveExtensions/AlamofireImage/ImageDownloaderExtensions.swift b/Deprecated/AlamofireImage/ImageDownloaderExtensions.swift similarity index 100% rename from ACKReactiveExtensions/AlamofireImage/ImageDownloaderExtensions.swift rename to Deprecated/AlamofireImage/ImageDownloaderExtensions.swift diff --git a/Package.resolved b/Package.resolved index 8b75f05..a4e1a27 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,24 +1,6 @@ { "object": { "pins": [ - { - "package": "Alamofire", - "repositoryURL": "https://github.com/Alamofire/Alamofire.git", - "state": { - "branch": null, - "revision": "78424be314842833c04bc3bef5b72e85fff99204", - "version": "5.6.4" - } - }, - { - "package": "AlamofireImage", - "repositoryURL": "https://github.com/Alamofire/AlamofireImage", - "state": { - "branch": null, - "revision": "98cbb00ce0ec5fc8e52a5b50a6bfc08d3e5aee10", - "version": "4.2.0" - } - }, { "package": "ReactiveCocoa", "repositoryURL": "https://github.com/ReactiveCocoa/ReactiveCocoa", diff --git a/Package.swift b/Package.swift index 68106b4..219bbf0 100644 --- a/Package.swift +++ b/Package.swift @@ -7,25 +7,62 @@ let package = Package( .iOS(.v12), ], products: [ - .library(name: "ACKReactiveExtensionsCore", targets: ["ACKReactiveExtensionsCore"]), - .library(name: "ACKReactiveExtensionsUIKit", targets: ["ACKReactiveExtensionsUIKit"]), - .library(name: "ACKReactiveExtensionsWebKit", targets: ["ACKReactiveExtensionsWebKit"]), - .library(name: "ACKReactiveExtensionsAlamofireImage", targets: ["ACKReactiveExtensionsAlamofireImage"]), + .library( + name: "ACKReactiveExtensionsCore", + targets: ["ACKReactiveExtensionsCore"] + ), + .library( + name: "ACKReactiveExtensionsUIKit", + targets: ["ACKReactiveExtensionsUIKit"] + ), + .library( + name: "ACKReactiveExtensionsWebKit", + targets: ["ACKReactiveExtensionsWebKit"] + ), ], dependencies: [ - .package(url: "https://github.com/Alamofire/AlamofireImage", .upToNextMajor(from: "4.0.0")), - .package(url: "https://github.com/ReactiveCocoa/ReactiveCocoa", .upToNextMajor(from: "12.0.0")), - .package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", .upToNextMajor(from: "7.0.0")), + .package( + url: "https://github.com/ReactiveCocoa/ReactiveCocoa", + .upToNextMajor( + from: "12.0.0" + ) + ), + .package( + url: "https://github.com/ReactiveCocoa/ReactiveSwift", + .upToNextMajor( + from: "7.0.0" + ) + ), ], targets: [ - .target(name: "ACKReactiveExtensionsAlamofireImage", dependencies: [ - .target(name: "ACKReactiveExtensionsCore"), - .product(name: "AlamofireImage", package: "AlamofireImage")], path: "ACKReactiveExtensions/AlamofireImage"), - .target(name: "ACKReactiveExtensionsCore", dependencies: [ - .product(name: "ReactiveSwift", package: "ReactiveSwift"), - .product(name: "ReactiveCocoa", package: "ReactiveCocoa")], path: "ACKReactiveExtensions/Core"), - .target(name: "ACKReactiveExtensionsUIKit", dependencies: [.target(name: "ACKReactiveExtensionsCore")], path: "ACKReactiveExtensions/UIKit"), - .target(name: "ACKReactiveExtensionsWebKit", dependencies: [.target(name: "ACKReactiveExtensionsCore")], path: "ACKReactiveExtensions/WebKit"), + .target( + name: "ACKReactiveExtensionsCore", + dependencies: [ + .product( + name: "ReactiveSwift", + package: "ReactiveSwift" + ), + .product( + name: "ReactiveCocoa", + package: "ReactiveCocoa" + ) + ], + path: "ACKReactiveExtensions/Core" + ), + .target( + name: "ACKReactiveExtensionsUIKit", + dependencies: [ + "ACKReactiveExtensionsCore" + ], + path: "ACKReactiveExtensions/UIKit" + ), + .target( + name: "ACKReactiveExtensionsWebKit", + dependencies: [ + "ACKReactiveExtensionsCore" + ], + path: "ACKReactiveExtensions/WebKit" + ), ], swiftLanguageVersions: [ .v5