From 478fc4845109b76f609032c58cd679a1978c943e Mon Sep 17 00:00:00 2001 From: Ryan Nystrom Date: Thu, 18 Oct 2018 19:47:22 -0400 Subject: [PATCH] update ContextMenu --- Podfile.lock | 6 +- .../ClippedContainerViewController.swift | 6 +- .../ContextMenu/ContextMenu+Options.swift | 4 +- .../ContextMenu/ContextMenu/ContextMenu.swift | 1 + .../ContextMenuPresentationController.swift | 57 +++-- .../ContextMenu/SourceViewCorner.swift | 2 +- Pods/Local Podspecs/ContextMenu.podspec.json | 6 +- Pods/Manifest.lock | 6 +- Pods/Pods.xcodeproj/project.pbxproj | 212 +++++++++--------- .../ContextMenu/Info.plist | 2 +- .../com.mono0926.LicensePlist.plist | 2 +- 11 files changed, 161 insertions(+), 143 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index ed10cd1b9..04b7744df 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -7,7 +7,7 @@ PODS: - Apollo/Core (0.8.0) - AutoInsetter (1.2.3) - cmark-gfm-swift (0.1.0) - - ContextMenu (0.2.0) + - ContextMenu (0.3.1) - Crashlytics (3.9.3): - Fabric (~> 1.7.2) - DateAgo (0.1.0) @@ -151,7 +151,7 @@ CHECKOUT OPTIONS: :commit: 74cc625beed7cbcec5c1c50f2aba807e9246a73a :git: https://github.com/GitHawkApp/cmark-gfm-swift.git ContextMenu: - :commit: e7cf153f3c6b0d6145d0035ad2f78451c5d557d7 + :commit: a6956a50277f2382b920058ea90f78a82caeaaa9 :git: https://github.com/GitHawkApp/ContextMenu.git FlatCache: :commit: beb697643eea11f40bb66683d1576a2772080d9d @@ -178,7 +178,7 @@ SPEC CHECKSUMS: Apollo: 66e0f52289551545adb7ecdd994e713fdbae26eb AutoInsetter: 1a8f8ad5e7da8e993970b3809cfb8e8e330f4db1 cmark-gfm-swift: 9915dfe0cd7feda740ab01fc2a1882989b6d5128 - ContextMenu: cdc8c03a3a682bee74f493dfa9dfb55fdc2b19a2 + ContextMenu: 7c2853a894e09325dba222dbc87ba594ab775321 Crashlytics: dbb07d01876c171c5ccbdf7826410380189e452c DateAgo: c678b6435627f2b267980bc6f0a9969389686691 Fabric: 9cd6a848efcf1b8b07497e0b6a2e7d336353ba15 diff --git a/Pods/ContextMenu/ContextMenu/ClippedContainerViewController.swift b/Pods/ContextMenu/ContextMenu/ClippedContainerViewController.swift index 195ac5339..7888c0a05 100644 --- a/Pods/ContextMenu/ContextMenu/ClippedContainerViewController.swift +++ b/Pods/ContextMenu/ContextMenu/ClippedContainerViewController.swift @@ -36,7 +36,7 @@ class ClippedContainerViewController: UIViewController { view.layer.shadowColor = UIColor.black.cgColor view.backgroundColor = options.containerStyle.backgroundColor - if options.containerStyle.motionEffect && UIAccessibilityIsReduceMotionEnabled() == false { + if options.containerStyle.motionEffect && UIAccessibility.isReduceMotionEnabled == false { let amount = 12 let tiltX = UIInterpolatingMotionEffect(keyPath: "center.x", type: .tiltAlongHorizontalAxis) tiltX.minimumRelativeValue = -amount @@ -68,9 +68,9 @@ class ClippedContainerViewController: UIViewController { navigationBar.setBackgroundImage(image, for: .any, barMetrics: .default) navigationBar.shadowImage = image - addChildViewController(containedViewController) + addChild(containedViewController) view.addSubview(containedViewController.view) - containedViewController.didMove(toParentViewController: self) + containedViewController.didMove(toParent: self) preferredContentSize = containedViewController.preferredContentSize } diff --git a/Pods/ContextMenu/ContextMenu/ContextMenu+Options.swift b/Pods/ContextMenu/ContextMenu/ContextMenu+Options.swift index a3408a489..fc5fcc558 100644 --- a/Pods/ContextMenu/ContextMenu/ContextMenu+Options.swift +++ b/Pods/ContextMenu/ContextMenu/ContextMenu+Options.swift @@ -23,13 +23,13 @@ extension ContextMenu { let menuStyle: MenuStyle /// Trigger haptic feedback when the menu is shown. - let hapticsStyle: UIImpactFeedbackStyle? + let hapticsStyle: UIImpactFeedbackGenerator.FeedbackStyle? public init( durations: AnimationDurations = AnimationDurations(), containerStyle: ContainerStyle = ContainerStyle(), menuStyle: MenuStyle = .default, - hapticsStyle: UIImpactFeedbackStyle? = nil + hapticsStyle: UIImpactFeedbackGenerator.FeedbackStyle? = nil ) { self.durations = durations self.containerStyle = containerStyle diff --git a/Pods/ContextMenu/ContextMenu/ContextMenu.swift b/Pods/ContextMenu/ContextMenu/ContextMenu.swift index f9e507fc6..8ad0e5517 100644 --- a/Pods/ContextMenu/ContextMenu/ContextMenu.swift +++ b/Pods/ContextMenu/ContextMenu/ContextMenu.swift @@ -16,6 +16,7 @@ public class ContextMenu: NSObject { var item: Item? + private override init() {} /// Show a context menu from a view controller with given options. /// diff --git a/Pods/ContextMenu/ContextMenu/ContextMenuPresentationController.swift b/Pods/ContextMenu/ContextMenu/ContextMenuPresentationController.swift index ea3da322f..00d461273 100644 --- a/Pods/ContextMenu/ContextMenu/ContextMenuPresentationController.swift +++ b/Pods/ContextMenu/ContextMenu/ContextMenuPresentationController.swift @@ -16,10 +16,29 @@ class ContextMenuPresentationController: UIPresentationController { weak var contextDelegate: ContextMenuPresentationControllerDelegate? let item: ContextMenu.Item + var keyboardSpace: CGFloat = 0 init(presentedViewController: UIViewController, presenting presentingViewController: UIViewController?, item: ContextMenu.Item) { self.item = item super.init(presentedViewController: presentedViewController, presenting: presentingViewController) + NotificationCenter.default.addObserver( + self, + selector: #selector(onKeyboard(notification:)), + name: UIResponder.keyboardWillShowNotification, + object: nil + ) + NotificationCenter.default.addObserver( + self, + selector: #selector(onKeyboard(notification:)), + name: UIResponder.keyboardWillHideNotification, + object: nil + ) + NotificationCenter.default.addObserver( + self, + selector: #selector(onKeyboard(notification:)), + name: UIResponder.keyboardWillChangeFrameNotification, + object: nil + ) } lazy var overlayView: UIView = { @@ -34,28 +53,13 @@ class ContextMenuPresentationController: UIPresentationController { let frame = item.sourceView?.superview?.convert(sourceViewFrame, to: containerView) else { return nil} - let corners: [SourceViewCorner] = [ - SourceViewCorner(point: CGPoint(x: frame.minX, y: frame.minY), position: .topLeft), - SourceViewCorner(point: CGPoint(x: frame.maxX, y: frame.minY), position: .topRight), - SourceViewCorner(point: CGPoint(x: frame.minX, y: frame.maxY), position: .bottomLeft), - SourceViewCorner(point: CGPoint(x: frame.maxX, y: frame.maxY), position: .bottomRight), - ] - - var maxArea: CGFloat = 0 - var maxCorner: SourceViewCorner? = nil - for corner in corners { - let area = containerView.bounds.area(corner: corner) - if area > maxArea { - maxArea = area - maxCorner = corner - } - } - return maxCorner + return containerView.bounds.dominantCorner(in: frame) } override var frameOfPresentedViewInContainerView: CGRect { guard let containerBounds = containerView?.bounds else { return .zero } let size = presentedViewController.preferredContentSize + let frame: CGRect if let corner = preferredSourceViewCorner { let minPadding = item.options.containerStyle.edgePadding let x = corner.point.x @@ -64,20 +68,21 @@ class ContextMenuPresentationController: UIPresentationController { let y = corner.point.y + corner.position.ySizeModifier * size.height + corner.position.yModifier * item.options.containerStyle.yPadding - return CGRect( + frame = CGRect( x: max(minPadding, min(containerBounds.width - size.width - minPadding, x)), y: max(minPadding, min(containerBounds.height - size.height - minPadding, y)), width: size.width, height: size.height ) } else { - return CGRect( + frame = CGRect( x: (containerBounds.width - size.width)/2, - y: (containerBounds.height - size.height)/2, + y: (containerBounds.height - keyboardSpace - size.height)/2, width: size.width, height: size.height ) } + return frame.integral } override func containerViewWillLayoutSubviews() { @@ -158,4 +163,16 @@ class ContextMenuPresentationController: UIPresentationController { } } + @objc func onKeyboard(notification: Notification) { + guard let frame = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect, + let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? TimeInterval, + let containerView = self.containerView + else { return } + keyboardSpace = containerView.bounds.height - frame.minY + UIView.animate(withDuration: duration) { + containerView.setNeedsLayout() + containerView.layoutIfNeeded() + } + } + } diff --git a/Pods/ContextMenu/ContextMenu/SourceViewCorner.swift b/Pods/ContextMenu/ContextMenu/SourceViewCorner.swift index 665344250..845b2bd2f 100644 --- a/Pods/ContextMenu/ContextMenu/SourceViewCorner.swift +++ b/Pods/ContextMenu/ContextMenu/SourceViewCorner.swift @@ -10,7 +10,7 @@ import UIKit struct SourceViewCorner { - enum Position { + enum Position: Int { case topLeft case topRight case bottomLeft diff --git a/Pods/Local Podspecs/ContextMenu.podspec.json b/Pods/Local Podspecs/ContextMenu.podspec.json index bc23bd7fa..f309bba18 100644 --- a/Pods/Local Podspecs/ContextMenu.podspec.json +++ b/Pods/Local Podspecs/ContextMenu.podspec.json @@ -1,6 +1,6 @@ { "name": "ContextMenu", - "version": "0.2.0", + "version": "0.3.1", "license": { "type": "MIT" }, @@ -11,11 +11,11 @@ "summary": "Context menu inspired by Things 3.", "source": { "git": "https://github.com/GitHawkApp/ContextMenu.git", - "tag": "0.2.0" + "tag": "0.3.1" }, "source_files": "ContextMenu/*.swift", "platforms": { "ios": "10.0" }, - "swift_version": "4.0" + "swift_version": "4.2" } diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index ed10cd1b9..04b7744df 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -7,7 +7,7 @@ PODS: - Apollo/Core (0.8.0) - AutoInsetter (1.2.3) - cmark-gfm-swift (0.1.0) - - ContextMenu (0.2.0) + - ContextMenu (0.3.1) - Crashlytics (3.9.3): - Fabric (~> 1.7.2) - DateAgo (0.1.0) @@ -151,7 +151,7 @@ CHECKOUT OPTIONS: :commit: 74cc625beed7cbcec5c1c50f2aba807e9246a73a :git: https://github.com/GitHawkApp/cmark-gfm-swift.git ContextMenu: - :commit: e7cf153f3c6b0d6145d0035ad2f78451c5d557d7 + :commit: a6956a50277f2382b920058ea90f78a82caeaaa9 :git: https://github.com/GitHawkApp/ContextMenu.git FlatCache: :commit: beb697643eea11f40bb66683d1576a2772080d9d @@ -178,7 +178,7 @@ SPEC CHECKSUMS: Apollo: 66e0f52289551545adb7ecdd994e713fdbae26eb AutoInsetter: 1a8f8ad5e7da8e993970b3809cfb8e8e330f4db1 cmark-gfm-swift: 9915dfe0cd7feda740ab01fc2a1882989b6d5128 - ContextMenu: cdc8c03a3a682bee74f493dfa9dfb55fdc2b19a2 + ContextMenu: 7c2853a894e09325dba222dbc87ba594ab775321 Crashlytics: dbb07d01876c171c5ccbdf7826410380189e452c DateAgo: c678b6435627f2b267980bc6f0a9969389686691 Fabric: 9cd6a848efcf1b8b07497e0b6a2e7d336353ba15 diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 66582a0ec..0fc606d98 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -9980,41 +9980,6 @@ }; name = TestFlight; }; - 2223965908CB95C78D9F2034D7F91DF6 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 97B8CBD21BD69CBA5744939C0CDA1651 /* ContextMenu.xcconfig */; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/ContextMenu/ContextMenu-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ContextMenu/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/ContextMenu/ContextMenu.modulemap"; - PRODUCT_MODULE_NAME = ContextMenu; - PRODUCT_NAME = ContextMenu; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 222772B71D5EEAC2CB8C7BF6A098490A /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9498F16C6F9F7B47910456ACC08624BB /* Squawk.xcconfig */; @@ -10217,6 +10182,41 @@ }; name = Release; }; + 2F5805D5BF5A03CED4112CA641C97D4D /* TestFlight */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 97B8CBD21BD69CBA5744939C0CDA1651 /* ContextMenu.xcconfig */; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/ContextMenu/ContextMenu-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ContextMenu/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/ContextMenu/ContextMenu.modulemap"; + PRODUCT_MODULE_NAME = ContextMenu; + PRODUCT_NAME = ContextMenu; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = TestFlight; + }; 2FD1B2CEB11DA3C1C308E9660F5A1C9A /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 10022B1504CDEE9B34A5C6F74620EE67 /* MessageViewController.xcconfig */; @@ -11523,39 +11523,6 @@ }; name = Debug; }; - 8137C8576A85FF3D236BE16EF27E1285 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 97B8CBD21BD69CBA5744939C0CDA1651 /* ContextMenu.xcconfig */; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/ContextMenu/ContextMenu-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ContextMenu/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/ContextMenu/ContextMenu.modulemap"; - PRODUCT_MODULE_NAME = ContextMenu; - PRODUCT_NAME = ContextMenu; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; 8180E92E1F527E1442DC9E03713203DD /* TestFlight */ = { isa = XCBuildConfiguration; baseConfigurationReference = 3561EA0242DE16D07BBC34442BEAC238 /* NYTPhotoViewer.xcconfig */; @@ -11843,6 +11810,41 @@ }; name = Debug; }; + 925733CE926CAE7C67669FC67913C456 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 97B8CBD21BD69CBA5744939C0CDA1651 /* ContextMenu.xcconfig */; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/ContextMenu/ContextMenu-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ContextMenu/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/ContextMenu/ContextMenu.modulemap"; + PRODUCT_MODULE_NAME = ContextMenu; + PRODUCT_NAME = ContextMenu; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; 92DBCC21D394D9F88081B7884DAE92CE /* TestFlight */ = { isa = XCBuildConfiguration; baseConfigurationReference = 7E8ED14F01B777D8D76FF5A573ED8FCC /* Pageboy.xcconfig */; @@ -12164,6 +12166,39 @@ }; name = TestFlight; }; + A39BF22325337EFC270A04152DE40A2C /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 97B8CBD21BD69CBA5744939C0CDA1651 /* ContextMenu.xcconfig */; + buildSettings = { + CLANG_ENABLE_OBJC_WEAK = NO; + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/ContextMenu/ContextMenu-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/ContextMenu/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/ContextMenu/ContextMenu.modulemap"; + PRODUCT_MODULE_NAME = ContextMenu; + PRODUCT_NAME = ContextMenu; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; AAF1F1146D935F3880B399E6020076E2 /* TestFlight */ = { isa = XCBuildConfiguration; baseConfigurationReference = 6633BCFE8C70554958F357A85B4E30F7 /* Apollo-iOS.xcconfig */; @@ -13370,41 +13405,6 @@ }; name = Release; }; - E5F7709FC5DCA7DFE68A4657ABF335C8 /* TestFlight */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 97B8CBD21BD69CBA5744939C0CDA1651 /* ContextMenu.xcconfig */; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/ContextMenu/ContextMenu-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/ContextMenu/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/ContextMenu/ContextMenu.modulemap"; - PRODUCT_MODULE_NAME = ContextMenu; - PRODUCT_NAME = ContextMenu; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = TestFlight; - }; E9F508A619F4BFB7CE665C44D32F714C /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 9BB808075BCEA111648F532CA02A7793 /* TUSafariActivity.xcconfig */; @@ -13790,9 +13790,9 @@ 000D114B63969F559854AAC4D22BFA1A /* Build configuration list for PBXNativeTarget "ContextMenu" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8137C8576A85FF3D236BE16EF27E1285 /* Debug */, - 2223965908CB95C78D9F2034D7F91DF6 /* Release */, - E5F7709FC5DCA7DFE68A4657ABF335C8 /* TestFlight */, + A39BF22325337EFC270A04152DE40A2C /* Debug */, + 925733CE926CAE7C67669FC67913C456 /* Release */, + 2F5805D5BF5A03CED4112CA641C97D4D /* TestFlight */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Target Support Files/ContextMenu/Info.plist b/Pods/Target Support Files/ContextMenu/Info.plist index 0d7bfa2a5..1caf1ff85 100644 --- a/Pods/Target Support Files/ContextMenu/Info.plist +++ b/Pods/Target Support Files/ContextMenu/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.2.0 + 0.3.1 CFBundleSignature ???? CFBundleVersion diff --git a/Settings.bundle/com.mono0926.LicensePlist.plist b/Settings.bundle/com.mono0926.LicensePlist.plist index a06146757..7ffa5b3e5 100644 --- a/Settings.bundle/com.mono0926.LicensePlist.plist +++ b/Settings.bundle/com.mono0926.LicensePlist.plist @@ -200,7 +200,7 @@ File com.mono0926.LicensePlist/SwiftLint Title - SwiftLint (0.24.0) + SwiftLint (0.27.0) Type PSChildPaneSpecifier