From 34596eed3e481604e0995d5cb7feedd795894dcd Mon Sep 17 00:00:00 2001 From: Bas Broek Date: Wed, 27 Mar 2019 23:03:28 +0100 Subject: [PATCH] Update to Swift 5 (#9) * Update to Swift 5 * Update podspec * Update Travis * Run pod install * Update changelog --- .travis.yml | 4 +- CHANGELOG.md | 4 + .../project.pbxproj | 70 +- .../ImageAlertAction-Example.xcscheme | 2 +- Example/Podfile | 2 + Example/Podfile.lock | 10 +- .../ImageAlertAction.podspec.json | 6 +- Example/Pods/Manifest.lock | 10 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 654 +++++++++--------- .../ImageAlertAction-Info.plist | 26 + .../ImageAlertAction.xcconfig | 5 +- .../Pods-ImageAlertAction_Example-Info.plist | 26 + ...ods-ImageAlertAction_Example-frameworks.sh | 33 +- ...ds-ImageAlertAction_Example.debug.xcconfig | 6 +- ...-ImageAlertAction_Example.release.xcconfig | 6 +- .../Pods-ImageAlertAction_Tests-Info.plist | 26 + ...Pods-ImageAlertAction_Tests.debug.xcconfig | 3 +- ...ds-ImageAlertAction_Tests.release.xcconfig | 3 +- ImageAlertAction.podspec | 4 +- .../Classes/UIAlertAction+Image.swift | 2 +- 20 files changed, 497 insertions(+), 405 deletions(-) create mode 100644 Example/Pods/Target Support Files/ImageAlertAction/ImageAlertAction-Info.plist create mode 100644 Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-Info.plist create mode 100644 Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-Info.plist diff --git a/.travis.yml b/.travis.yml index c782113..ae98bc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: swift -osx_image: xcode10 +osx_image: xcode10.2 script: - - xcodebuild clean test -workspace Example/ImageAlertAction.xcworkspace -scheme ImageAlertAction-Example -destination "platform=iOS Simulator,name=iPhone X,OS=12.0" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet + - xcodebuild clean test -workspace Example/ImageAlertAction.xcworkspace -scheme ImageAlertAction-Example -destination "platform=iOS Simulator,name=iPhone X,OS=12.2" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet diff --git a/CHANGELOG.md b/CHANGELOG.md index caa6fa1..8a34216 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Next +## 3.0.0 + +- Updated to Swift 5.0 + ## 2.0.0 - Updated to Swift 4.2 diff --git a/Example/ImageAlertAction.xcodeproj/project.pbxproj b/Example/ImageAlertAction.xcodeproj/project.pbxproj index a269f95..84c7b9d 100644 --- a/Example/ImageAlertAction.xcodeproj/project.pbxproj +++ b/Example/ImageAlertAction.xcodeproj/project.pbxproj @@ -172,7 +172,6 @@ 607FACCD1AFB9204008FA782 /* Frameworks */, 607FACCE1AFB9204008FA782 /* Resources */, A1CB783A469A79F75C2C0D0A /* [CP] Embed Pods Frameworks */, - 2C0343649D3C06F415A5A140 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -191,8 +190,6 @@ 607FACE11AFB9204008FA782 /* Sources */, 607FACE21AFB9204008FA782 /* Frameworks */, 607FACE31AFB9204008FA782 /* Resources */, - 225EC59716E726C269D944A5 /* [CP] Embed Pods Frameworks */, - A4CEB215EE7DB774AE87041D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -211,23 +208,23 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 1000; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; TestTargetID = 607FACCF1AFB9204008FA782; }; }; }; buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "ImageAlertAction" */; compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -266,36 +263,6 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 225EC59716E726C269D944A5 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 2C0343649D3C06F415A5A140 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 4373DC80D597D901935FC03C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -338,7 +305,7 @@ files = ( ); inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh", + "${PODS_ROOT}/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh", "${BUILT_PRODUCTS_DIR}/ImageAlertAction/ImageAlertAction.framework", ); name = "[CP] Embed Pods Frameworks"; @@ -347,22 +314,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - A4CEB215EE7DB774AE87041D /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Copy Pods Resources"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -419,6 +371,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -474,6 +427,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -528,7 +482,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -542,7 +496,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; @@ -562,7 +516,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ImageAlertAction_Example.app/ImageAlertAction_Example"; }; name = Debug; @@ -579,7 +533,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ImageAlertAction_Example.app/ImageAlertAction_Example"; }; name = Release; diff --git a/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme b/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme index cd54e50..17de8bf 100644 --- a/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme +++ b/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme @@ -1,6 +1,6 @@ + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 3.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/ImageAlertAction/ImageAlertAction.xcconfig b/Example/Pods/Target Support Files/ImageAlertAction/ImageAlertAction.xcconfig index e5305ed..4b8685d 100644 --- a/Example/Pods/Target Support Files/ImageAlertAction/ImageAlertAction.xcconfig +++ b/Example/Pods/Target Support Files/ImageAlertAction/ImageAlertAction.xcconfig @@ -1,8 +1,7 @@ CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 -HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public" -OTHER_LDFLAGS = -framework "UIKit" -OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" +OTHER_LDFLAGS = $(inherited) -framework "UIKit" +OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} diff --git a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-Info.plist b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-Info.plist new file mode 100644 index 0000000..2243fe6 --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh index 0db58cb..b666072 100755 --- a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh +++ b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example-frameworks.sh @@ -1,9 +1,23 @@ #!/bin/sh set -e +set -u +set -o pipefail + +function on_error { + echo "$(realpath -mq "${0}"):$1: error: Unexpected failure" +} +trap 'on_error $LINENO' ERR + +if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then + # If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy + # frameworks to, so exit 0 (signalling the script phase was successful). + exit 0 +fi echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" +COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}" SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}" # Used as a return value for each invocation of `strip_invalid_archs` function. @@ -27,8 +41,8 @@ install_framework() local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then - echo "Symlinked..." - source="$(readlink "${source}")" + echo "Symlinked..." + source="$(readlink "${source}")" fi # Use filter instead of exclude so missing patterns don't throw errors. @@ -38,8 +52,13 @@ install_framework() local basename basename="$(basename -s .framework "$1")" binary="${destination}/${basename}.framework/${basename}" + if ! [ -r "$binary" ]; then binary="${destination}/${basename}" + elif [ -L "${binary}" ]; then + echo "Destination binary is symlinked..." + dirname="$(dirname "${binary}")" + binary="${dirname}/$(readlink "${binary}")" fi # Strip invalid architectures so "fat" simulator / device frameworks work on device @@ -53,7 +72,7 @@ install_framework() # Embed linked Swift runtime libraries. No longer necessary as of Xcode 7. if [ "${XCODE_VERSION_MAJOR}" -lt 7 ]; then local swift_runtime_libs - swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u && exit ${PIPESTATUS[0]}) + swift_runtime_libs=$(xcrun otool -LX "$binary" | grep --color=never @rpath/libswift | sed -E s/@rpath\\/\(.+dylib\).*/\\1/g | uniq -u) for lib in $swift_runtime_libs; do echo "rsync -auv \"${SWIFT_STDLIB_PATH}/${lib}\" \"${destination}\"" rsync -auv "${SWIFT_STDLIB_PATH}/${lib}" "${destination}" @@ -92,10 +111,10 @@ install_dsym() { # Signs a framework with the provided identity code_sign_if_enabled() { - if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then - # Use the current code_sign_identitiy + if [ -n "${EXPANDED_CODE_SIGN_IDENTITY:-}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then + # Use the current code_sign_identity echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'" + local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'" if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then code_sign_cmd="$code_sign_cmd &" @@ -122,7 +141,7 @@ strip_invalid_archs() { for arch in $binary_archs; do if ! [[ "${ARCHS}" == *"$arch"* ]]; then # Strip non-valid architectures in-place - lipo -remove "$arch" -output "$binary" "$binary" || exit 1 + lipo -remove "$arch" -output "$binary" "$binary" stripped="$stripped $arch" fi done diff --git a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.debug.xcconfig b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.debug.xcconfig index 789bd93..1bc5c48 100644 --- a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.debug.xcconfig @@ -1,10 +1,10 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" -OTHER_LDFLAGS = $(inherited) -framework "ImageAlertAction" -OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" +OTHER_LDFLAGS = $(inherited) -framework "ImageAlertAction" -framework "UIKit" +OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.release.xcconfig b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.release.xcconfig index 789bd93..1bc5c48 100644 --- a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Example/Pods-ImageAlertAction_Example.release.xcconfig @@ -1,10 +1,10 @@ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" -OTHER_LDFLAGS = $(inherited) -framework "ImageAlertAction" -OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS" +OTHER_LDFLAGS = $(inherited) -framework "ImageAlertAction" -framework "UIKit" +OTHER_SWIFT_FLAGS = $(inherited) -D COCOAPODS PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-Info.plist b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-Info.plist new file mode 100644 index 0000000..2243fe6 --- /dev/null +++ b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests-Info.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0.0 + CFBundleSignature + ???? + CFBundleVersion + ${CURRENT_PROJECT_VERSION} + NSPrincipalClass + + + diff --git a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.debug.xcconfig b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.debug.xcconfig index 9e39868..6e74f00 100644 --- a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.debug.xcconfig +++ b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.debug.xcconfig @@ -1,7 +1,8 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "ImageAlertAction" -framework "UIKit" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.release.xcconfig b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.release.xcconfig index 9e39868..6e74f00 100644 --- a/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.release.xcconfig +++ b/Example/Pods/Target Support Files/Pods-ImageAlertAction_Tests/Pods-ImageAlertAction_Tests.release.xcconfig @@ -1,7 +1,8 @@ FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 +HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/ImageAlertAction/ImageAlertAction.framework/Headers" +OTHER_LDFLAGS = $(inherited) -framework "ImageAlertAction" -framework "UIKit" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/ImageAlertAction.podspec b/ImageAlertAction.podspec index 343847b..c0aa505 100644 --- a/ImageAlertAction.podspec +++ b/ImageAlertAction.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ImageAlertAction' - s.version = '2.0.0' + s.version = '3.0.0' s.summary = 'Image support for UIAlertAction' s.description = <<-DESC ImageAlertAction adds image support to UIAlertAction. @@ -15,7 +15,7 @@ Use this to visually convey an action's purpose. s.social_media_url = 'https://twitter.com/basthomas' s.ios.deployment_target = '8.0' - s.swift_version = '4.2' + s.swift_version = '5.0' s.source_files = 'ImageAlertAction/Classes/**/*' diff --git a/ImageAlertAction/Classes/UIAlertAction+Image.swift b/ImageAlertAction/Classes/UIAlertAction+Image.swift index 5f6a805..1d05b75 100644 --- a/ImageAlertAction/Classes/UIAlertAction+Image.swift +++ b/ImageAlertAction/Classes/UIAlertAction+Image.swift @@ -8,7 +8,7 @@ import UIKit @available(tvOS 8.0, *) -public extension UIAlertAction { +extension UIAlertAction { private var imageKey: String { return "image" }