From a847c6c0278b8b89afbfbefa8631aa37d0af8d3b Mon Sep 17 00:00:00 2001 From: icbbetter Date: Fri, 23 Nov 2018 10:17:57 +0800 Subject: [PATCH] fix bug --- PicU.xcodeproj/project.pbxproj | 38 +++++++++---------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++ Podfile.lock | 15 +++++--- UPImage/SMMSService.swift | 1 - 4 files changed, 36 insertions(+), 26 deletions(-) create mode 100644 PicU.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/PicU.xcodeproj/project.pbxproj b/PicU.xcodeproj/project.pbxproj index 9c8f4ba..84808a5 100644 --- a/PicU.xcodeproj/project.pbxproj +++ b/PicU.xcodeproj/project.pbxproj @@ -137,7 +137,6 @@ DD7B7E591D322CC700B68805 /* Frameworks */, DD7B7E5A1D322CC700B68805 /* Resources */, 50EC8073D39A9D4A030E7A35 /* [CP] Embed Pods Frameworks */, - 1E2B0980C6A11CB92A9DFC83 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -160,7 +159,7 @@ TargetAttributes = { DD7B7E5B1D322CC700B68805 = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 44QSUE25K9; + DevelopmentTeam = G47J9W9F35; LastSwiftMigration = 0810; ProvisioningStyle = Automatic; SystemCapabilities = { @@ -210,30 +209,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1E2B0980C6A11CB92A9DFC83 /* [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-PicU/Pods-PicU-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; 50EC8073D39A9D4A030E7A35 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-PicU/Pods-PicU-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework", + "${BUILT_PRODUCTS_DIR}/HappyDNS/HappyDNS.framework", + "${BUILT_PRODUCTS_DIR}/MASPreferences/MASPreferences.framework", + "${BUILT_PRODUCTS_DIR}/Qiniu/Qiniu.framework", + "${BUILT_PRODUCTS_DIR}/TMCache/TMCache.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HappyDNS.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MASPreferences.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Qiniu.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TMCache.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -246,13 +241,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PicU-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"; + 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 */ @@ -371,7 +369,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 44QSUE25K9; + DEVELOPMENT_TEAM = G47J9W9F35; INFOPLIST_FILE = UPImage/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; @@ -395,7 +393,7 @@ CODE_SIGN_IDENTITY = "Mac Developer"; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer"; COMBINE_HIDPI_IMAGES = YES; - DEVELOPMENT_TEAM = 44QSUE25K9; + DEVELOPMENT_TEAM = G47J9W9F35; INFOPLIST_FILE = UPImage/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.11; diff --git a/PicU.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/PicU.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/PicU.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Podfile.lock b/Podfile.lock index debc1f0..c451174 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -12,7 +12,6 @@ PODS: - AFNetworking/Reachability (3.1.0) - AFNetworking/Security (3.1.0) - AFNetworking/Serialization (3.1.0) - - Alamofire (4.2.0) - HappyDNS (0.3.10) - MASPreferences (1.1.4) - Qiniu (7.1.4): @@ -21,19 +20,25 @@ PODS: - TMCache (2.1.0) DEPENDENCIES: - - Alamofire - MASPreferences - Qiniu - TMCache +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - AFNetworking + - HappyDNS + - MASPreferences + - Qiniu + - TMCache + SPEC CHECKSUMS: AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67 - Alamofire: aa2e09d871c9160ac53c90e83c68064a94e3dfbe HappyDNS: 06a9fed2796663fd87626dbf02552933265bf059 MASPreferences: 7bdcfe891d7840453cf48f95fa866c3e152ace7a Qiniu: a4c962782035ee25b9da3e195181d8c384bb75be TMCache: 95ebcc9b3c7e90fb5fd8fc3036cba3aa781c9bed -PODFILE CHECKSUM: 84faa9332dd0db3e3cf520e31dcf0d8761e7b81b +PODFILE CHECKSUM: 67254f85860b4a1ca52413c2991e390d206f5656 -COCOAPODS: 1.2.1 +COCOAPODS: 1.5.2 diff --git a/UPImage/SMMSService.swift b/UPImage/SMMSService.swift index c8d8296..1981c75 100644 --- a/UPImage/SMMSService.swift +++ b/UPImage/SMMSService.swift @@ -8,7 +8,6 @@ import Cocoa import AFNetworking -import Alamofire class SMMSService: NSObject { static let shared = SMMSService()