diff --git a/EachNavigationBar.podspec b/EachNavigationBar.podspec index 4a5401a..10a69fe 100644 --- a/EachNavigationBar.podspec +++ b/EachNavigationBar.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'EachNavigationBar' - s.version = '1.15.3' + s.version = '1.16.0' s.summary = 'A custom navigation bar of UIViewController.' s.homepage = 'https://github.com/Pircate/EachNavigationBar' s.license = { :type => 'MIT', :file => 'LICENSE' } @@ -10,5 +10,5 @@ Pod::Spec.new do |s| s.resource_bundles = { 'EachNavigationBar' => ['EachNavigationBar/Assets/*.xcassets'] } s.frameworks = 'UIKit' s.swift_versions = ['5.1', '5.2', '5.3'] - s.ios.deployment_target = '10.0' + s.ios.deployment_target = '11.0' end diff --git a/EachNavigationBar/Classes/Configuration.swift b/EachNavigationBar/Classes/Configuration.swift index 93aece2..dc8e13d 100644 --- a/EachNavigationBar/Classes/Configuration.swift +++ b/EachNavigationBar/Classes/Configuration.swift @@ -56,20 +56,17 @@ extension UINavigationController { public extension UINavigationController.Configuration { - @available(iOS 11.0, *) /// Padding of navigation bar content view. var layoutPaddings: UIEdgeInsets { get { _layoutPaddings } set { _layoutPaddings = newValue } } - @available(iOS 11.0, *) var prefersLargeTitles: Bool { get { _prefersLargeTitles } set { _prefersLargeTitles = newValue } } - @available(iOS 11.0, *) var largeTitle: LargeTitle { get { _largeTitle } set { _largeTitle = newValue } diff --git a/EachNavigationBar/Classes/EachNavigationBar.swift b/EachNavigationBar/Classes/EachNavigationBar.swift index b49b129..8eccafb 100644 --- a/EachNavigationBar/Classes/EachNavigationBar.swift +++ b/EachNavigationBar/Classes/EachNavigationBar.swift @@ -28,7 +28,7 @@ open class EachNavigationBar: UINavigationBar { } didSet { frame.size.height = barHeight + _additionalHeight - viewController?.adjustsSafeAreaInsetsAfterIOS11() + viewController?.adjustsSafeAreaInsets() } } @@ -64,7 +64,6 @@ open class EachNavigationBar: UINavigationBar { } } - @available(iOS 11.0, *) /// Padding of navigation bar content view. open var layoutPaddings: UIEdgeInsets { get { _layoutPaddings } @@ -131,7 +130,7 @@ extension EachNavigationBar { changed.insert(\.isHidden) } didSet { - viewController?.adjustsSafeAreaInsetsAfterIOS11() + viewController?.adjustsSafeAreaInsets() } } @@ -210,7 +209,6 @@ extension EachNavigationBar { } } - @available(iOS 11.0, *) open override var prefersLargeTitles: Bool { get { return super.prefersLargeTitles } set { @@ -226,7 +224,6 @@ extension EachNavigationBar { } } - @available(iOS 11.0, *) open override var largeTitleTextAttributes: [NSAttributedString.Key : Any]? { get { return super.largeTitleTextAttributes } set { @@ -271,9 +268,10 @@ extension EachNavigationBar { } var _additionalHeight: CGFloat { - if #available(iOS 11.0, *) { - if isLargeTitleShown { return 0 } + guard !isLargeTitleShown else { + return 0 } + return additionalHeight } @@ -310,7 +308,6 @@ private extension EachNavigationBar { return viewController?.navigationController?.navigationBar } - @available(iOS 11.0, *) var contentView: UIView? { if let contentView = _contentView { return contentView } @@ -321,7 +318,6 @@ private extension EachNavigationBar { return _contentView } - @available(iOS 11.0, *) var isLargeTitleShown: Bool { return prefersLargeTitles && viewController?._navigationItem.largeTitleDisplayMode != .never } @@ -341,12 +337,10 @@ private extension EachNavigationBar { height: bounds.height + barMinY ) - adjustsLayoutMarginsAfterIOS11() + adjustsLayoutMargins() } - func adjustsLayoutMarginsAfterIOS11() { - guard #available(iOS 11.0, *) else { return } - + func adjustsLayoutMargins() { layoutMargins = .barLayoutMargins guard let contentView = contentView else { return } diff --git a/EachNavigationBar/Classes/EachNavigationItem.swift b/EachNavigationBar/Classes/EachNavigationItem.swift index aef4a7a..392d799 100644 --- a/EachNavigationBar/Classes/EachNavigationItem.swift +++ b/EachNavigationBar/Classes/EachNavigationItem.swift @@ -25,7 +25,6 @@ class EachNavigationItem: UINavigationItem { didSet { viewController?.navigationItem.title = title } } - @available(iOS 11.0, *) override var largeTitleDisplayMode: UINavigationItem.LargeTitleDisplayMode { get { super.largeTitleDisplayMode } set { diff --git a/EachNavigationBar/Classes/UINavigationBar+Sugar.swift b/EachNavigationBar/Classes/UINavigationBar+Sugar.swift index e58af9f..8163c0b 100644 --- a/EachNavigationBar/Classes/UINavigationBar+Sugar.swift +++ b/EachNavigationBar/Classes/UINavigationBar+Sugar.swift @@ -15,7 +15,6 @@ public extension UINavigationBar { setTitleColor(color.withAlphaComponent(alpha)) } - @available(iOS 11.0, *) func setLargeTitleAlpha(_ alpha: CGFloat) { let color = largeTitleTextAttributes?[.foregroundColor] as? UIColor ?? defaultTitleColor setLargeTitleColor(color.withAlphaComponent(alpha)) @@ -41,7 +40,6 @@ private extension UINavigationBar { } } - @available(iOS 11.0, *) func setLargeTitleColor(_ color: UIColor) { if var largeTitleTextAttributes = largeTitleTextAttributes { largeTitleTextAttributes[.foregroundColor] = color diff --git a/EachNavigationBar/Classes/UINavigationController+EachNavigationBar.swift b/EachNavigationBar/Classes/UINavigationController+EachNavigationBar.swift index 284cbc9..a21f226 100644 --- a/EachNavigationBar/Classes/UINavigationController+EachNavigationBar.swift +++ b/EachNavigationBar/Classes/UINavigationController+EachNavigationBar.swift @@ -24,13 +24,13 @@ extension UINavigationController { bar.adjustsLayout() - topViewController?.adjustsSafeAreaInsetsAfterIOS11() + topViewController?.adjustsSafeAreaInsets() } open override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() - guard #available(iOS 11.0, *), _configuration.isEnabled else { return } + guard _configuration.isEnabled else { return } topViewController?._navigationBar.adjustsLayout() } diff --git a/EachNavigationBar/Classes/UIViewController+EachNavigationBar.swift b/EachNavigationBar/Classes/UIViewController+EachNavigationBar.swift index 4464aab..a7c38ee 100644 --- a/EachNavigationBar/Classes/UIViewController+EachNavigationBar.swift +++ b/EachNavigationBar/Classes/UIViewController+EachNavigationBar.swift @@ -60,19 +60,15 @@ extension UIViewController { guard let navigationBar = navigationController?.navigationBar else { return } navigationBar.barStyle = _navigationBar.superBarStyle navigationBar.isHidden = _navigationBar.isHidden - if #available(iOS 11.0, *) { - adjustsSafeAreaInsetsAfterIOS11() - navigationItem.title = _navigationItem.title - navigationItem.largeTitleDisplayMode = _navigationItem.largeTitleDisplayMode - navigationBar.prefersLargeTitles = _navigationBar.prefersLargeTitles - navigationBar.largeTitleTextAttributes = _navigationBar.largeTitleTextAttributes - } + adjustsSafeAreaInsets() + navigationItem.title = _navigationItem.title + navigationItem.largeTitleDisplayMode = _navigationItem.largeTitleDisplayMode + navigationBar.prefersLargeTitles = _navigationBar.prefersLargeTitles + navigationBar.largeTitleTextAttributes = _navigationBar.largeTitleTextAttributes view.bringSubviewToFront(_navigationBar) } - func adjustsSafeAreaInsetsAfterIOS11() { - guard #available(iOS 11.0, *) else { return } - + func adjustsSafeAreaInsets() { let height = _navigationBar.additionalView?.frame.height ?? 0 additionalSafeAreaInsets.top = _navigationBar.isHidden ? -view.safeAreaInsets.top @@ -137,11 +133,9 @@ private extension EachNavigationBar { self.shadow = shadow } - if #available(iOS 11.0, *) { - layoutPaddings = configuration.layoutPaddings - prefersLargeTitles = configuration.prefersLargeTitles - largeTitleTextAttributes = configuration.largeTitle.textAttributes - } + layoutPaddings = configuration.layoutPaddings + prefersLargeTitles = configuration.prefersLargeTitles + largeTitleTextAttributes = configuration.largeTitle.textAttributes // 清空修改记录 changed.removeAll() @@ -200,16 +194,14 @@ private extension EachNavigationBar { } } - if #available(iOS 11.0, *) { - if !changed.contains(\.layoutPaddings) { - layoutPaddings = configuration.layoutPaddings - } - if !changed.contains(\.prefersLargeTitles) { - prefersLargeTitles = configuration.prefersLargeTitles - } - if !changed.contains(\.largeTitleTextAttributes) { - largeTitleTextAttributes = configuration.largeTitle.textAttributes - } + if !changed.contains(\.layoutPaddings) { + layoutPaddings = configuration.layoutPaddings + } + if !changed.contains(\.prefersLargeTitles) { + prefersLargeTitles = configuration.prefersLargeTitles + } + if !changed.contains(\.largeTitleTextAttributes) { + largeTitleTextAttributes = configuration.largeTitle.textAttributes } // 恢复原始记录 @@ -220,9 +212,7 @@ private extension EachNavigationBar { private extension EachNavigationItem { func apply(_ configuration: UINavigationController.Configuration) { - if #available(iOS 11.0, *) { - largeTitleDisplayMode = configuration.largeTitle.displayMode - } + largeTitleDisplayMode = configuration.largeTitle.displayMode // 清空修改记录 changed.removeAll() @@ -231,10 +221,8 @@ private extension EachNavigationItem { func update(_ configuration: UINavigationController.Configuration) { let original = changed - if #available(iOS 11.0, *) { - if !changed.contains(\.largeTitleDisplayMode) { - largeTitleDisplayMode = configuration.largeTitle.displayMode - } + if !changed.contains(\.largeTitleDisplayMode) { + largeTitleDisplayMode = configuration.largeTitle.displayMode } // 恢复原始记录 diff --git a/Example/EachNavigationBar.xcodeproj/project.pbxproj b/Example/EachNavigationBar.xcodeproj/project.pbxproj index e40e384..537d8c8 100644 --- a/Example/EachNavigationBar.xcodeproj/project.pbxproj +++ b/Example/EachNavigationBar.xcodeproj/project.pbxproj @@ -488,7 +488,7 @@ CLANG_ENABLE_MODULES = YES; DEVELOPMENT_TEAM = 8G74YECJ4Z; INFOPLIST_FILE = EachNavigationBar/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; @@ -507,7 +507,7 @@ CLANG_ENABLE_MODULES = YES; DEVELOPMENT_TEAM = 8G74YECJ4Z; INFOPLIST_FILE = EachNavigationBar/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; diff --git a/Example/Podfile b/Example/Podfile index a38e0f2..9bf3d37 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,4 +1,6 @@ -platform :ios, '10.0' +source "https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git" + +platform :ios, '11.0' use_frameworks! install! 'cocoapods', :disable_input_output_paths => true diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 0a47957..1613f3e 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - EachNavigationBar (1.15.2) + - EachNavigationBar (1.15.3) DEPENDENCIES: - EachNavigationBar (from `../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - EachNavigationBar: 6cdd53f13bf343fc1a4d0e7b7c7355ece7e4e1f3 + EachNavigationBar: caedb0f99ce0e3e2de85f72e26fda5b3b237a539 -PODFILE CHECKSUM: 3d71b1022ea23b1310df8ab078b9afba8a68e3d2 +PODFILE CHECKSUM: 3503b3c3ed8084d02f4e01da33c319181282b40d COCOAPODS: 1.11.2 diff --git a/Example/Pods/Local Podspecs/EachNavigationBar.podspec.json b/Example/Pods/Local Podspecs/EachNavigationBar.podspec.json index 83aac5f..f4da060 100644 --- a/Example/Pods/Local Podspecs/EachNavigationBar.podspec.json +++ b/Example/Pods/Local Podspecs/EachNavigationBar.podspec.json @@ -1,6 +1,6 @@ { "name": "EachNavigationBar", - "version": "1.15.2", + "version": "1.15.3", "summary": "A custom navigation bar of UIViewController.", "homepage": "https://github.com/Pircate/EachNavigationBar", "license": { @@ -12,7 +12,7 @@ }, "source": { "git": "https://github.com/Pircate/EachNavigationBar.git", - "tag": "1.15.2" + "tag": "1.15.3" }, "source_files": "EachNavigationBar/Classes/**/*", "resource_bundles": { @@ -27,7 +27,7 @@ "5.3" ], "platforms": { - "ios": "10.0" + "ios": "11.0" }, "swift_version": "5.3" } diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock index 0a47957..1613f3e 100644 --- a/Example/Pods/Manifest.lock +++ b/Example/Pods/Manifest.lock @@ -1,5 +1,5 @@ PODS: - - EachNavigationBar (1.15.2) + - EachNavigationBar (1.15.3) DEPENDENCIES: - EachNavigationBar (from `../`) @@ -9,8 +9,8 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - EachNavigationBar: 6cdd53f13bf343fc1a4d0e7b7c7355ece7e4e1f3 + EachNavigationBar: caedb0f99ce0e3e2de85f72e26fda5b3b237a539 -PODFILE CHECKSUM: 3d71b1022ea23b1310df8ab078b9afba8a68e3d2 +PODFILE CHECKSUM: 3503b3c3ed8084d02f4e01da33c319181282b40d COCOAPODS: 1.11.2 diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj index 8e25493..b47cfa1 100644 --- a/Example/Pods/Pods.xcodeproj/project.pbxproj +++ b/Example/Pods/Pods.xcodeproj/project.pbxproj @@ -529,11 +529,12 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 1502B487001D51CA5B761AD615F2D40A /* Release */ = { + 05D401B43F552D035C099506097A5910 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 0EC7FDD960FA333702A9BCDA1761E804 /* Pods-EachNavigationBar_Tests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -545,7 +546,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "Target Support Files/Pods-EachNavigationBar_Tests/Pods-EachNavigationBar_Tests-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MODULEMAP_FILE = "Target Support Files/Pods-EachNavigationBar_Tests/Pods-EachNavigationBar_Tests.modulemap"; @@ -563,14 +564,14 @@ }; name = Release; }; - 168AC49998754BB05D61F15494117043 /* Debug */ = { + 27108C451089F8D52056DF85B825E21C /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 78CAFB8EB20EE13D69C7E6478FF03CA0 /* EachNavigationBar.debug.xcconfig */; buildSettings = { CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/EachNavigationBar"; IBSC_MODULE = EachNavigationBar; INFOPLIST_FILE = "Target Support Files/EachNavigationBar/ResourceBundle-EachNavigationBar-EachNavigationBar-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = EachNavigationBar; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -579,14 +580,14 @@ }; name = Debug; }; - 4410C12AF600064F36535B78CCA1E2DE /* Release */ = { + 3897947824716637EE958BE023DB7B72 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = 55CAA433338DF08D8363E2668C8A3DB0 /* EachNavigationBar.release.xcconfig */; buildSettings = { CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/EachNavigationBar"; IBSC_MODULE = EachNavigationBar; INFOPLIST_FILE = "Target Support Files/EachNavigationBar/ResourceBundle-EachNavigationBar-EachNavigationBar-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = EachNavigationBar; SDKROOT = iphoneos; SKIP_INSTALL = YES; @@ -595,11 +596,11 @@ }; name = Release; }; - 55AC57557FA8F18E10B2E081173900F7 /* Debug */ = { + 429F4F7C5AAA41435A696F492AD881C8 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C40DA9799651634BC61479D7632CEA35 /* Pods-EachNavigationBar_Tests.debug.xcconfig */; + baseConfigurationReference = 55CAA433338DF08D8363E2668C8A3DB0 /* EachNavigationBar.release.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -609,30 +610,31 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-EachNavigationBar_Tests/Pods-EachNavigationBar_Tests-Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/EachNavigationBar/EachNavigationBar-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/EachNavigationBar/EachNavigationBar-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-EachNavigationBar_Tests/Pods-EachNavigationBar_Tests.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + MODULEMAP_FILE = "Target Support Files/EachNavigationBar/EachNavigationBar.modulemap"; + PRODUCT_MODULE_NAME = EachNavigationBar; + PRODUCT_NAME = EachNavigationBar; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_VERSION = 5.3; TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Debug; + name = Release; }; - 5EDD8EAEB17032AEAED628D04E3999ED /* Debug */ = { + 42C813B806DBEF8278BD1CD95FAAE2D2 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 41ADEDB991A6F7A17DC102F85F9B4E6B /* Pods-EachNavigationBar_Example.debug.xcconfig */; + baseConfigurationReference = C40DA9799651634BC61479D7632CEA35 /* Pods-EachNavigationBar_Tests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -642,12 +644,12 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-EachNavigationBar_Example/Pods-EachNavigationBar_Example-Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-EachNavigationBar_Tests/Pods-EachNavigationBar_Tests-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-EachNavigationBar_Example/Pods-EachNavigationBar_Example.modulemap"; + MODULEMAP_FILE = "Target Support Files/Pods-EachNavigationBar_Tests/Pods-EachNavigationBar_Tests.modulemap"; OTHER_LDFLAGS = ""; OTHER_LIBTOOLFLAGS = ""; PODS_ROOT = "$(SRCROOT)"; @@ -661,7 +663,7 @@ }; name = Debug; }; - 7EE7A78859F657F6BEFC651185B43192 /* Release */ = { + 903A0004D3E6651EFD5D2E16214D101B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -711,7 +713,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -723,11 +725,46 @@ }; name = Release; }; - C61635207647AD38803360BEF0CA3370 /* Release */ = { + 9D3A83F36EE450D597F9400CCBC46828 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 41ADEDB991A6F7A17DC102F85F9B4E6B /* Pods-EachNavigationBar_Example.debug.xcconfig */; + buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_ENABLE_OBJC_WEAK = NO; + "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"; + INFOPLIST_FILE = "Target Support Files/Pods-EachNavigationBar_Example/Pods-EachNavigationBar_Example-Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-EachNavigationBar_Example/Pods-EachNavigationBar_Example.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + ADA4E2054878F238B61BFD0F5C774DC0 /* Release */ = { isa = XCBuildConfiguration; baseConfigurationReference = E24EDDAFF6EEF7DD8DF4D3C19D06F649 /* Pods-EachNavigationBar_Example.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -739,7 +776,7 @@ DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = "Target Support Files/Pods-EachNavigationBar_Example/Pods-EachNavigationBar_Example-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MODULEMAP_FILE = "Target Support Files/Pods-EachNavigationBar_Example/Pods-EachNavigationBar_Example.modulemap"; @@ -757,7 +794,7 @@ }; name = Release; }; - D299434AB35E7FD6F7921C8EF24742FF /* Debug */ = { + B4EFE046ACF8F37157F6E322C7FCFC28 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; @@ -810,7 +847,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -823,10 +860,11 @@ }; name = Debug; }; - D91D423E182D9CEE935FFB55E7363B25 /* Debug */ = { + F3D79216665801AAC18D3C7BA8A48566 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 78CAFB8EB20EE13D69C7E6478FF03CA0 /* EachNavigationBar.debug.xcconfig */; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_ENABLE_OBJC_WEAK = NO; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -839,7 +877,7 @@ GCC_PREFIX_HEADER = "Target Support Files/EachNavigationBar/EachNavigationBar-prefix.pch"; INFOPLIST_FILE = "Target Support Files/EachNavigationBar/EachNavigationBar-Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MODULEMAP_FILE = "Target Support Files/EachNavigationBar/EachNavigationBar.modulemap"; PRODUCT_MODULE_NAME = EachNavigationBar; @@ -854,46 +892,14 @@ }; name = Debug; }; - DBB5333BF20F5F9FE0AE196A88E6DC55 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 55CAA433338DF08D8363E2668C8A3DB0 /* EachNavigationBar.release.xcconfig */; - buildSettings = { - CLANG_ENABLE_OBJC_WEAK = NO; - "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/EachNavigationBar/EachNavigationBar-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/EachNavigationBar/EachNavigationBar-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/EachNavigationBar/EachNavigationBar.modulemap"; - PRODUCT_MODULE_NAME = EachNavigationBar; - PRODUCT_NAME = EachNavigationBar; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_VERSION = 5.3; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 0CB61E593B939A11C12A0B4DA5F9F4B4 /* Build configuration list for PBXNativeTarget "Pods-EachNavigationBar_Example" */ = { isa = XCConfigurationList; buildConfigurations = ( - 5EDD8EAEB17032AEAED628D04E3999ED /* Debug */, - C61635207647AD38803360BEF0CA3370 /* Release */, + 9D3A83F36EE450D597F9400CCBC46828 /* Debug */, + ADA4E2054878F238B61BFD0F5C774DC0 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -901,8 +907,8 @@ 4821239608C13582E20E6DA73FD5F1F9 /* Build configuration list for PBXProject "Pods" */ = { isa = XCConfigurationList; buildConfigurations = ( - D299434AB35E7FD6F7921C8EF24742FF /* Debug */, - 7EE7A78859F657F6BEFC651185B43192 /* Release */, + B4EFE046ACF8F37157F6E322C7FCFC28 /* Debug */, + 903A0004D3E6651EFD5D2E16214D101B /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -910,8 +916,8 @@ 8CE354836AC3E2B4F8A1FDFF6F69BCAF /* Build configuration list for PBXNativeTarget "Pods-EachNavigationBar_Tests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 55AC57557FA8F18E10B2E081173900F7 /* Debug */, - 1502B487001D51CA5B761AD615F2D40A /* Release */, + 42C813B806DBEF8278BD1CD95FAAE2D2 /* Debug */, + 05D401B43F552D035C099506097A5910 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -919,8 +925,8 @@ 9BF0D33D0A343AA0D51C4C5DECD06196 /* Build configuration list for PBXNativeTarget "EachNavigationBar-EachNavigationBar" */ = { isa = XCConfigurationList; buildConfigurations = ( - 168AC49998754BB05D61F15494117043 /* Debug */, - 4410C12AF600064F36535B78CCA1E2DE /* Release */, + 27108C451089F8D52056DF85B825E21C /* Debug */, + 3897947824716637EE958BE023DB7B72 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -928,8 +934,8 @@ ECE693EDBEBEBCE03A29A4A5A0A5CD6B /* Build configuration list for PBXNativeTarget "EachNavigationBar" */ = { isa = XCConfigurationList; buildConfigurations = ( - D91D423E182D9CEE935FFB55E7363B25 /* Debug */, - DBB5333BF20F5F9FE0AE196A88E6DC55 /* Release */, + F3D79216665801AAC18D3C7BA8A48566 /* Debug */, + 429F4F7C5AAA41435A696F492AD881C8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/EachNavigationBar-EachNavigationBar.xcscheme b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/EachNavigationBar-EachNavigationBar.xcscheme new file mode 100644 index 0000000..30b99d5 --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/EachNavigationBar-EachNavigationBar.xcscheme @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/EachNavigationBar.xcscheme b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/EachNavigationBar.xcscheme new file mode 100644 index 0000000..5481074 --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/EachNavigationBar.xcscheme @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/Pods-EachNavigationBar_Example.xcscheme b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/Pods-EachNavigationBar_Example.xcscheme new file mode 100644 index 0000000..357b9ae --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/Pods-EachNavigationBar_Example.xcscheme @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/Pods-EachNavigationBar_Tests.xcscheme b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/Pods-EachNavigationBar_Tests.xcscheme new file mode 100644 index 0000000..f309de6 --- /dev/null +++ b/Example/Pods/Pods.xcodeproj/xcuserdata/gaoxiang.xcuserdatad/xcschemes/Pods-EachNavigationBar_Tests.xcscheme @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Example/Pods/Target Support Files/EachNavigationBar/EachNavigationBar-Info.plist b/Example/Pods/Target Support Files/EachNavigationBar/EachNavigationBar-Info.plist index 7b82b20..f942948 100644 --- a/Example/Pods/Target Support Files/EachNavigationBar/EachNavigationBar-Info.plist +++ b/Example/Pods/Target Support Files/EachNavigationBar/EachNavigationBar-Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.15.2 + 1.15.3 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Pods/Target Support Files/EachNavigationBar/ResourceBundle-EachNavigationBar-EachNavigationBar-Info.plist b/Example/Pods/Target Support Files/EachNavigationBar/ResourceBundle-EachNavigationBar-EachNavigationBar-Info.plist index 872f897..83827c4 100644 --- a/Example/Pods/Target Support Files/EachNavigationBar/ResourceBundle-EachNavigationBar-EachNavigationBar-Info.plist +++ b/Example/Pods/Target Support Files/EachNavigationBar/ResourceBundle-EachNavigationBar-EachNavigationBar-Info.plist @@ -13,7 +13,7 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.15.2 + 1.15.3 CFBundleSignature ???? CFBundleVersion diff --git a/Gemfile.lock b/Gemfile.lock index 76142d1..9e7c622 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -270,6 +270,7 @@ GEM zeitwerk (2.5.1) PLATFORMS + ruby x86_64-darwin-20 DEPENDENCIES diff --git a/fastlane/README.md b/fastlane/README.md index 08c4eda..a24688e 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -24,6 +24,6 @@ release new version ---- -This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run. +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. More information about fastlane can be found on [fastlane.tools](https://fastlane.tools). The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/fastlane/report.xml b/fastlane/report.xml new file mode 100644 index 0000000..e342ae8 --- /dev/null +++ b/fastlane/report.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +