diff --git a/Cartfile b/Cartfile index c36489c2..2378d072 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ github "hyperoslo/Hue" ~> 3.0 -github "hyperoslo/Imaginary" ~> 3.0 \ No newline at end of file +github "hyperoslo/Imaginary" == 3.0.4 \ No newline at end of file diff --git a/Lightbox.xcodeproj/project.pbxproj b/Lightbox.xcodeproj/project.pbxproj index 69ea813b..d1fb8e28 100644 --- a/Lightbox.xcodeproj/project.pbxproj +++ b/Lightbox.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ 166E3BA920333E04006799C1 /* LightboxImageStub.swift in Sources */ = {isa = PBXBuildFile; fileRef = 166E3BA820333E04006799C1 /* LightboxImageStub.swift */; }; + 2EFABDC5010CA600492B8112 /* Pods_Lightbox_iOS_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 468B595D8DFAA131F4FBAE3D /* Pods_Lightbox_iOS_Tests.framework */; }; D22006741DFB4D9700E92898 /* Lightbox.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D22006731DFB4D9700E92898 /* Lightbox.bundle */; }; D229B5E61FC3123F00F04123 /* Lightbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D523B0A91C43AA2A001AD1EC /* Lightbox.framework */; }; D229B5ED1FC3125D00F04123 /* InfoLabelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D229B5EC1FC3125D00F04123 /* InfoLabelTests.swift */; }; @@ -25,6 +26,7 @@ D573A2F51C5B5CA4006053DD /* LightboxTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = D573A2F41C5B5CA4006053DD /* LightboxTransition.swift */; }; D573A2F71C5B5E55006053DD /* UIView+Gradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = D573A2F61C5B5E55006053DD /* UIView+Gradient.swift */; }; D58A18CB1C5ABF8F000024BB /* FooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D58A18CA1C5ABF8F000024BB /* FooterView.swift */; }; + E1E7D5F0F0C33D6037170301 /* Pods_Lightbox_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 19C2DED487968E28C243EA51 /* Pods_Lightbox_iOS.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -39,6 +41,11 @@ /* Begin PBXFileReference section */ 166E3BA820333E04006799C1 /* LightboxImageStub.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LightboxImageStub.swift; sourceTree = ""; }; + 19C2DED487968E28C243EA51 /* Pods_Lightbox_iOS.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Lightbox_iOS.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 2AAB5940CF484E3A78DA28D6 /* Pods-Lightbox-iOS.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lightbox-iOS.release.xcconfig"; path = "Pods/Target Support Files/Pods-Lightbox-iOS/Pods-Lightbox-iOS.release.xcconfig"; sourceTree = ""; }; + 41535BEC7603E96CB3ADED31 /* Pods-Lightbox-iOS-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lightbox-iOS-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Lightbox-iOS-Tests/Pods-Lightbox-iOS-Tests.debug.xcconfig"; sourceTree = ""; }; + 468B595D8DFAA131F4FBAE3D /* Pods_Lightbox_iOS_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Lightbox_iOS_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 9B394F20F4F1F0B462F65197 /* Pods-Lightbox-iOS-Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lightbox-iOS-Tests.release.xcconfig"; path = "Pods/Target Support Files/Pods-Lightbox-iOS-Tests/Pods-Lightbox-iOS-Tests.release.xcconfig"; sourceTree = ""; }; D22006731DFB4D9700E92898 /* Lightbox.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Lightbox.bundle; sourceTree = ""; }; D229B5E11FC3123F00F04123 /* Lightbox-iOS-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Lightbox-iOS-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; D229B5E51FC3123F00F04123 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -59,6 +66,7 @@ D573A2F41C5B5CA4006053DD /* LightboxTransition.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LightboxTransition.swift; sourceTree = ""; }; D573A2F61C5B5E55006053DD /* UIView+Gradient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Gradient.swift"; sourceTree = ""; }; D58A18CA1C5ABF8F000024BB /* FooterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FooterView.swift; sourceTree = ""; }; + DACEC88D992F5F26455F0432 /* Pods-Lightbox-iOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Lightbox-iOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Lightbox-iOS/Pods-Lightbox-iOS.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -67,6 +75,7 @@ buildActionMask = 2147483647; files = ( D229B5E61FC3123F00F04123 /* Lightbox.framework in Frameworks */, + 2EFABDC5010CA600492B8112 /* Pods_Lightbox_iOS_Tests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,12 +85,24 @@ files = ( D2A58F5E1F7943A30064F14E /* Imaginary.framework in Frameworks */, D54DFCC21C5AAAF100ADEA0E /* Hue.framework in Frameworks */, + E1E7D5F0F0C33D6037170301 /* Pods_Lightbox_iOS.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 6F65BCD0AB9F75CF5C3CC341 /* Pods */ = { + isa = PBXGroup; + children = ( + DACEC88D992F5F26455F0432 /* Pods-Lightbox-iOS.debug.xcconfig */, + 2AAB5940CF484E3A78DA28D6 /* Pods-Lightbox-iOS.release.xcconfig */, + 41535BEC7603E96CB3ADED31 /* Pods-Lightbox-iOS-Tests.debug.xcconfig */, + 9B394F20F4F1F0B462F65197 /* Pods-Lightbox-iOS-Tests.release.xcconfig */, + ); + name = Pods; + sourceTree = ""; + }; D22006721DFB4D9700E92898 /* Resources */ = { isa = PBXGroup; children = ( @@ -103,6 +124,8 @@ isa = PBXGroup; children = ( D2A58F5D1F7943A30064F14E /* Imaginary.framework */, + 19C2DED487968E28C243EA51 /* Pods_Lightbox_iOS.framework */, + 468B595D8DFAA131F4FBAE3D /* Pods_Lightbox_iOS_Tests.framework */, ); name = Frameworks; sourceTree = ""; @@ -117,6 +140,7 @@ D229B5E21FC3123F00F04123 /* Lightbox-iOS-Tests */, D523B0AA1C43AA2A001AD1EC /* Products */, D2A58F5C1F7943A30064F14E /* Frameworks */, + 6F65BCD0AB9F75CF5C3CC341 /* Pods */, ); sourceTree = ""; }; @@ -190,9 +214,11 @@ isa = PBXNativeTarget; buildConfigurationList = D229B5E91FC3123F00F04123 /* Build configuration list for PBXNativeTarget "Lightbox-iOS-Tests" */; buildPhases = ( + 9F43B710E81161A59D8A6D08 /* [CP] Check Pods Manifest.lock */, D229B5DD1FC3123F00F04123 /* Sources */, D229B5DE1FC3123F00F04123 /* Frameworks */, D229B5DF1FC3123F00F04123 /* Resources */, + 922068475D318239AD379012 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -208,6 +234,7 @@ isa = PBXNativeTarget; buildConfigurationList = D523B0B11C43AA2A001AD1EC /* Build configuration list for PBXNativeTarget "Lightbox-iOS" */; buildPhases = ( + 4AAD1144C51D14CF9E0DC33E /* [CP] Check Pods Manifest.lock */, D523B0A41C43AA2A001AD1EC /* Sources */, D523B0A51C43AA2A001AD1EC /* Frameworks */, D523B0A61C43AA2A001AD1EC /* Headers */, @@ -230,11 +257,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0910; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Hyper Interaktiv AS"; TargetAttributes = { D229B5E01FC3123F00F04123 = { CreatedOnToolsVersion = 9.1; + DevelopmentTeam = 55622V7SY7; ProvisioningStyle = Automatic; }; D523B0A81C43AA2A001AD1EC = { @@ -280,6 +308,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 4AAD1144C51D14CF9E0DC33E /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Lightbox-iOS-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 5CF8A88D1F50B4EA00C28475 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -293,6 +339,46 @@ shellPath = /bin/sh; shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi"; }; + 922068475D318239AD379012 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-Lightbox-iOS-Tests/Pods-Lightbox-iOS-Tests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Cache/Cache.framework", + "${BUILT_PRODUCTS_DIR}/Hue/Hue.framework", + "${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hue.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Lightbox-iOS-Tests/Pods-Lightbox-iOS-Tests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 9F43B710E81161A59D8A6D08 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Lightbox-iOS-Tests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -337,6 +423,7 @@ /* Begin XCBuildConfiguration section */ D229B5EA1FC3123F00F04123 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 41535BEC7603E96CB3ADED31 /* Pods-Lightbox-iOS-Tests.debug.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -345,6 +432,7 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 55622V7SY7; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Lightbox-iOS-Tests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.1; @@ -352,13 +440,14 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.fantageek.Lightbox-iOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; D229B5EB1FC3123F00F04123 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 9B394F20F4F1F0B462F65197 /* Pods-Lightbox-iOS-Tests.release.xcconfig */; buildSettings = { CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; @@ -367,13 +456,14 @@ CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = 55622V7SY7; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Lightbox-iOS-Tests/Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 11.1; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.fantageek.Lightbox-iOS-Tests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -390,12 +480,14 @@ 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_RANGE_LOOP_ANALYSIS = YES; @@ -447,12 +539,14 @@ 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_RANGE_LOOP_ANALYSIS = YES; @@ -488,6 +582,7 @@ }; D523B0B21C43AA2A001AD1EC /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = DACEC88D992F5F26455F0432 /* Pods-Lightbox-iOS.debug.xcconfig */; buildSettings = { "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; @@ -500,16 +595,18 @@ ); INFOPLIST_FILE = Lightbox/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Lightbox; PRODUCT_NAME = Lightbox; SKIP_INSTALL = YES; + SWIFT_VERSION = 4.2; }; name = Debug; }; D523B0B31C43AA2A001AD1EC /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 2AAB5940CF484E3A78DA28D6 /* Pods-Lightbox-iOS.release.xcconfig */; buildSettings = { "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; DEFINES_MODULE = YES; @@ -522,11 +619,12 @@ ); INFOPLIST_FILE = Lightbox/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = no.hyper.Lightbox; PRODUCT_NAME = Lightbox; SKIP_INSTALL = YES; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Lightbox.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Lightbox.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Lightbox.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Lightbox.xcodeproj/xcshareddata/xcschemes/Lightbox-iOS.xcscheme b/Lightbox.xcodeproj/xcshareddata/xcschemes/Lightbox-iOS.xcscheme index b32d28d9..3470c6ec 100644 --- a/Lightbox.xcodeproj/xcshareddata/xcschemes/Lightbox-iOS.xcscheme +++ b/Lightbox.xcodeproj/xcshareddata/xcschemes/Lightbox-iOS.xcscheme @@ -1,6 +1,6 @@ + + + + + + diff --git a/Lightbox.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Lightbox.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Lightbox.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Podfile b/Podfile new file mode 100644 index 00000000..876ff5ef --- /dev/null +++ b/Podfile @@ -0,0 +1,19 @@ +use_frameworks! + +source 'https://bitbucket.org/digitalanimalca/ios-pods.git' +source 'https://github.com/CocoaPods/Specs.git' + +platform :ios, '11.0' + +def shared_pods + pod 'Imaginary', '3.0.4' + pod 'Hue', '~> 3.0' +end + +target 'Lightbox-iOS' do + shared_pods +end + +target 'Lightbox-iOS-Tests' do + shared_pods +end diff --git a/Podfile.lock b/Podfile.lock new file mode 100644 index 00000000..71efbf79 --- /dev/null +++ b/Podfile.lock @@ -0,0 +1,25 @@ +PODS: + - Cache (4.2.1) + - Hue (3.0.1) + - Imaginary (3.0.4): + - Cache (= 4.2.1) + +DEPENDENCIES: + - Hue (~> 3.0) + - Imaginary (= 3.0.4) + +SPEC REPOS: + https://bitbucket.org/digitalanimalca/ios-pods.git: + - Cache + - Imaginary + https://github.com/cocoapods/specs.git: + - Hue + +SPEC CHECKSUMS: + Cache: c3307248aaccf525ad5cc3a8f9f507f0dd4d8e78 + Hue: 93e852fa6211ab35922ad8c293f51c43d6c79eb2 + Imaginary: 2a0d13ebf1ef5823ce5432988e82446fa6b0e88e + +PODFILE CHECKSUM: 5d24fb5489c816d31dccd097f45df426fa667e2b + +COCOAPODS: 1.5.3 diff --git a/Source/Library/LightboxTransition.swift b/Source/Library/LightboxTransition.swift index 69092eeb..b0b5070e 100644 --- a/Source/Library/LightboxTransition.swift +++ b/Source/Library/LightboxTransition.swift @@ -163,7 +163,7 @@ extension LightboxTransition: UIGestureRecognizerDelegate { if let panGestureRecognizer = gestureRecognizer as? UIPanGestureRecognizer { let translation = panGestureRecognizer.translation(in: gestureRecognizer.view) - if fabs(translation.x) < fabs(translation.y) { + if abs(translation.x) < abs(translation.y) { result = true } } diff --git a/Source/LightboxConfig.swift b/Source/LightboxConfig.swift index 331c7d56..4b29e3c1 100644 --- a/Source/LightboxConfig.swift +++ b/Source/LightboxConfig.swift @@ -46,7 +46,7 @@ public class LightboxConfig { public static var enabled = true public static var separatorColor = UIColor(hex: "3D4757") - public static var textAttributes: [NSAttributedStringKey: Any] = [ + public static var textAttributes: [NSAttributedString.Key: Any] = [ .font: UIFont.systemFont(ofSize: 12), .foregroundColor: UIColor(hex: "899AB8"), .paragraphStyle: { @@ -63,7 +63,7 @@ public class LightboxConfig { public static var text = NSLocalizedString("Close", comment: "") public static var image: UIImage? - public static var textAttributes: [NSAttributedStringKey: Any] = [ + public static var textAttributes: [NSAttributedString.Key: Any] = [ .font: UIFont.boldSystemFont(ofSize: 16), .foregroundColor: UIColor.white, .paragraphStyle: { @@ -80,7 +80,7 @@ public class LightboxConfig { public static var text = NSLocalizedString("Delete", comment: "") public static var image: UIImage? - public static var textAttributes: [NSAttributedStringKey: Any] = [ + public static var textAttributes: [NSAttributedString.Key: Any] = [ .font: UIFont.boldSystemFont(ofSize: 16), .foregroundColor: UIColor(hex: "FA2F5B"), .paragraphStyle: { @@ -97,7 +97,7 @@ public class LightboxConfig { public static var ellipsisText = NSLocalizedString("Show more", comment: "") public static var ellipsisColor = UIColor(hex: "899AB9") - public static var textAttributes: [NSAttributedStringKey: Any] = [ + public static var textAttributes: [NSAttributedString.Key: Any] = [ .font: UIFont.systemFont(ofSize: 12), .foregroundColor: UIColor(hex: "DBDBDB") ] diff --git a/Source/LightboxController.swift b/Source/LightboxController.swift index 3c5115b7..c3ed03ab 100644 --- a/Source/LightboxController.swift +++ b/Source/LightboxController.swift @@ -25,7 +25,7 @@ open class LightboxController: UIViewController { scrollView.isPagingEnabled = false scrollView.delegate = self scrollView.showsHorizontalScrollIndicator = false - scrollView.decelerationRate = UIScrollViewDecelerationRateFast + scrollView.decelerationRate = UIScrollView.DecelerationRate.fast return scrollView }() @@ -320,7 +320,7 @@ open class LightboxController: UIViewController { fileprivate func loadDynamicBackground(_ image: UIImage) { backgroundView.image = image - backgroundView.layer.add(CATransition(), forKey: kCATransitionFade) + backgroundView.layer.add(CATransition(), forKey: CATransitionType.fade.rawValue) } func toggleControls(pageView: PageView?, visible: Bool, duration: TimeInterval = 0.1, delay: TimeInterval = 0) { diff --git a/Source/Views/HeaderView.swift b/Source/Views/HeaderView.swift index 0785f5ef..d51a64d1 100644 --- a/Source/Views/HeaderView.swift +++ b/Source/Views/HeaderView.swift @@ -13,7 +13,7 @@ open class HeaderView: UIView { let button = UIButton(type: .system) - button.setAttributedTitle(title, for: UIControlState()) + button.setAttributedTitle(title, for: UIControl.State()) if let size = LightboxConfig.CloseButton.size { button.frame.size = size @@ -25,7 +25,7 @@ open class HeaderView: UIView { for: .touchUpInside) if let image = LightboxConfig.CloseButton.image { - button.setBackgroundImage(image, for: UIControlState()) + button.setBackgroundImage(image, for: UIControl.State()) } button.isHidden = !LightboxConfig.CloseButton.enabled @@ -52,7 +52,7 @@ open class HeaderView: UIView { for: .touchUpInside) if let image = LightboxConfig.DeleteButton.image { - button.setBackgroundImage(image, for: UIControlState()) + button.setBackgroundImage(image, for: UIControl.State()) } button.isHidden = !LightboxConfig.DeleteButton.enabled diff --git a/Source/Views/InfoLabel.swift b/Source/Views/InfoLabel.swift index 74ac28ee..3d9d8b96 100644 --- a/Source/Views/InfoLabel.swift +++ b/Source/Views/InfoLabel.swift @@ -129,12 +129,12 @@ open class InfoLabel: UILabel { return string.boundingRect( with: CGSize(width: bounds.size.width, height: CGFloat.greatestFiniteMagnitude), options: [.usesLineFragmentOrigin, .usesFontLeading], - attributes: [NSAttributedStringKey.font: font], + attributes: [NSAttributedString.Key.font: font], context: nil).height } fileprivate func numberOfLines(_ string: String) -> Int { - let lineHeight = "A".size(withAttributes: [NSAttributedStringKey.font: font]).height + let lineHeight = "A".size(withAttributes: [NSAttributedString.Key.font: font]).height let totalHeight = heightForString(string) return Int(totalHeight / lineHeight) diff --git a/Source/Views/LoadingIndicator.swift b/Source/Views/LoadingIndicator.swift index 20725a8e..3a802f0b 100644 --- a/Source/Views/LoadingIndicator.swift +++ b/Source/Views/LoadingIndicator.swift @@ -13,7 +13,7 @@ class LoadingIndicator: UIView { alpha = 0 indicator = UIActivityIndicatorView() - indicator.activityIndicatorViewStyle = .whiteLarge + indicator.style = .whiteLarge indicator.startAnimating() addSubview(indicator) diff --git a/Source/Views/PageView.swift b/Source/Views/PageView.swift index e1bf5221..b21fd853 100644 --- a/Source/Views/PageView.swift +++ b/Source/Views/PageView.swift @@ -22,7 +22,7 @@ class PageView: UIScrollView { lazy var playButton: UIButton = { let button = UIButton(type: .custom) button.frame.size = CGSize(width: 60, height: 60) - button.setBackgroundImage(AssetManager.image("lightbox_play"), for: UIControlState()) + button.setBackgroundImage(AssetManager.image("lightbox_play"), for: UIControl.State()) button.addTarget(self, action: #selector(playButtonTouched(_:)), for: .touchUpInside) button.layer.shadowOffset = CGSize(width: 1, height: 1)