diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index e6c595e..97b5c54 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -120,7 +120,6 @@ CDA4E03520D3935B00CD2A0C /* Frameworks */, CDA4E03620D3935B00CD2A0C /* Resources */, FE957B34A041E54F84E4F88C /* [CP] Embed Pods Frameworks */, - 7224810F9340C39F39EB06D1 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -197,41 +196,21 @@ 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; }; - 7224810F9340C39F39EB06D1 /* [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-Example/Pods-Example-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; FE957B34A041E54F84E4F88C /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputPaths = ( - "${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/Inspire/Inspire.framework", - "${BUILT_PRODUCTS_DIR}/ProHUD/ProHUD.framework", - "${BUILT_PRODUCTS_DIR}/SnapKit/SnapKit.framework", + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Inspire.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ProHUD.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SnapKit.framework", + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -325,7 +304,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 = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -379,7 +358,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 = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; @@ -394,9 +373,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = WU2WFZ2B66; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = 34W5TB5KD2; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -406,7 +385,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xaoxuu.ProHUDExample; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "b32d51a3-c20b-408f-aebf-11d2ea3811cd"; - PROVISIONING_PROFILE_SPECIFIER = ""; + PROVISIONING_PROFILE_SPECIFIER = "com.xaoxuu.*"; SWIFT_OBJC_BRIDGING_HEADER = "Example/Example-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -420,6 +399,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; DEVELOPMENT_TEAM = 34W5TB5KD2; INFOPLIST_FILE = Example/Info.plist; diff --git a/Example/Podfile b/Example/Podfile index 6ba1a5f..48f0a8b 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -6,7 +6,7 @@ target 'Example' do pod 'ProHUD', :path => '..' pod 'SnapKit', '4.2.0' - pod 'Inspire', :path => '../../Inspire' + pod 'Inspire', '1.0.5' # :path => '../Inspire' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 955b418..79bd736 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -6,21 +6,24 @@ PODS: - SnapKit (4.2.0) DEPENDENCIES: - - Inspire (from `../../Inspire`) + - Inspire (= 1.0.5) - ProHUD (from `..`) - SnapKit (= 4.2.0) +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - Inspire + - SnapKit + EXTERNAL SOURCES: - Inspire: - :path: ../../Inspire ProHUD: - :path: .. + :path: ".." SPEC CHECKSUMS: - Inspire: a213962fa02d0c4b8e27e389318ff4b47e4565ed - ProHUD: 0b027f2e79a53869219703ed3f6ac3a48970fabd + Inspire: fcd7b5ed3b30506b7f04645719b52e0a89884cd4 + ProHUD: 6e5ce4d0599f9b8d2481783368cb08947df7657f SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a -PODFILE CHECKSUM: 69a97e50e038f3f68362d4cfd30617688f7824cc +PODFILE CHECKSUM: 973ed9d97f2f88c3dde66acf49139682be3748eb -COCOAPODS: 1.3.1 +COCOAPODS: 1.7.5 diff --git a/Podfile b/Podfile index cd0ee40..ba42c8b 100644 --- a/Podfile +++ b/Podfile @@ -1,10 +1,10 @@ -platform :ios, '10.0' +platform :ios, '9.0' use_frameworks! target 'ProHUD' do pod 'SnapKit', '4.2.0' - pod 'Inspire', :path => '../Inspire' + pod 'Inspire', '1.0.5' # :path => '../Inspire' end diff --git a/ProHUD.podspec b/ProHUD.podspec index fddc36d..0427b41 100755 --- a/ProHUD.podspec +++ b/ProHUD.podspec @@ -12,6 +12,7 @@ Pod::Spec.new do |s| s.source_files = 'ProHUD/**/*.swift' s.resource_bundles = { 'ProHUD' => ['ProHUD/*.{xcassets,strings,xml,storyboard,xib,xcdatamodeld,gif,lproj}'] } s.requires_arc = true + s.swift_version = '5.0' s.dependency 'SnapKit', '4.2.0' s.dependency 'Inspire' diff --git a/ProHUD.xcodeproj/project.pbxproj b/ProHUD.xcodeproj/project.pbxproj index a8e2f4c..52ffb32 100644 --- a/ProHUD.xcodeproj/project.pbxproj +++ b/ProHUD.xcodeproj/project.pbxproj @@ -40,7 +40,7 @@ CD95D21C22E72C4C007559A3 /* ProHUD.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ProHUD.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CD95D21F22E72C4C007559A3 /* ProHUD.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProHUD.h; sourceTree = ""; }; CD95D22022E72C4C007559A3 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CD95D26722E72D68007559A3 /* ProHUD.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = ProHUD.podspec; sourceTree = ""; }; + CD95D26722E72D68007559A3 /* ProHUD.podspec */ = {isa = PBXFileReference; lastKnownFileType = text; path = ProHUD.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; CD95D26822E72DA1007559A3 /* AlertController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlertController.swift; sourceTree = ""; }; CD95D26A22E72DB3007559A3 /* ProHUD.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProHUD.swift; sourceTree = ""; }; CDB6A07A22EEF06500AF6CF0 /* HUDController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HUDController.swift; sourceTree = ""; }; diff --git a/podspec.sh b/podspec.sh new file mode 100755 index 0000000..c1e406b --- /dev/null +++ b/podspec.sh @@ -0,0 +1,61 @@ +#!/bin/bash +# 如果目录下有一个podspec文件,直接询问版本号,然后打包验证、发布 +# 如果目录下有多个podspec文件,遍历每一个podspec文件,询问版本号,然后打包验证、发布 + +PARAM1=$1 + +function cmd_push(){ + # 输入版本号 + while : + do + if [ "$PARAM1" == "" ];then + read -p "请输入${FILENAME}版本号: " PARAM1 + else + break + fi + done + + # 更新podspec + sed -i "" "s/s.version\([ ]\{1,\}\)=\([ ]\{1,\}\)\([\'|\"]\)\([^\"]\{1,\}\([\'|\"]\)\)/s.version = \"${PARAM1}\"/g" ${FILENAME} + + # 打包验证 + git add --all + git commit -am "update podspec" + git push origin + git tag ${PARAM1} + git push --tags + pod lib lint + + # 发布 + read -p "现在要发布${FILENAME}吗? y/n: " pushnow + if [ "$pushnow" == "y" ];then + echo "> pod trunk push ${FILENAME}" + pod trunk push ${FILENAME} + fi + + +} + +function cmd_checkfile(){ + count=$(ls *.podspec | wc -l) + + # 遍历每一个podspec文件 + for FILENAME in *.podspec + do + if [ $count -gt 1 ]; then + read -p "检测到了${FILENAME},是否是您要发布的podspec? y/n: " yn + if [ "$yn" == "y" ];then + cmd_push + fi + elif [ $count == 1 ]; then + cmd_push + else + echo -e "> \\033[0;31m没有找到podspec。\\033[0;39m" + fi + done +} + +case $PARAM1 in + 'docs'|'help') open https://xaoxuu.com/wiki/podspec.sh/ ;; + *) cmd_checkfile ;; +esac