From d4c6b835596e3fe58678c865126b73c97cc7b62f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=86=AC=E9=9D=92?= <18210189817@qq.com> Date: Thu, 18 Jul 2019 15:58:49 +0800 Subject: [PATCH] pod update & swift_version -> Swift --- .../project.pbxproj | 43 ++------ .../contents.xcworkspacedata | 7 ++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ .../xcschemes/PhotoBrowserDemo.xcscheme | 101 ++++++++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++ Demo/PhotoBrowserDemo/AppDelegate.swift | 2 +- .../PhotoBrowserDemo/MenuViewController.swift | 2 +- .../PhotoBrowserDemo-Bridging-Header.h | 2 +- Demo/Podfile.lock | 20 ++-- 9 files changed, 147 insertions(+), 46 deletions(-) create mode 100644 Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Demo/PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme create mode 100644 Demo/PhotoBrowserDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Demo/PhotoBrowserDemo.xcodeproj/project.pbxproj b/Demo/PhotoBrowserDemo.xcodeproj/project.pbxproj index 5d9c8df1..49df4023 100644 --- a/Demo/PhotoBrowserDemo.xcodeproj/project.pbxproj +++ b/Demo/PhotoBrowserDemo.xcodeproj/project.pbxproj @@ -92,7 +92,6 @@ 7D2B79BF1FD25B7600F2094F /* PhotoBrowserDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PhotoBrowserDemoTests.m; sourceTree = ""; }; 7D2B79C11FD25B7600F2094F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7D2B79C71FD25BF300F2094F /* IDMUtilsTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = IDMUtilsTest.m; sourceTree = ""; }; - 7D7D66691E09D6D400410A67 /* IDMBrowserDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDMBrowserDelegate.h; sourceTree = ""; }; 7D7D666A1E09D6DA00410A67 /* IDMPhotoDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDMPhotoDataSource.h; sourceTree = ""; }; D00FA320EEACA8C835D9D626 /* Pods-PhotoBrowserDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PhotoBrowserDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-PhotoBrowserDemo/Pods-PhotoBrowserDemo.debug.xcconfig"; sourceTree = ""; }; D11464B61802FFC4005B7BC3 /* IDMPBConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = IDMPBConstants.h; sourceTree = ""; }; @@ -327,8 +326,6 @@ 4C6F978914AF734800F8389A /* Sources */, 4C6F978A14AF734800F8389A /* Frameworks */, 4C6F978B14AF734800F8389A /* Resources */, - 64D1E44DFBE2976FB9C75718 /* [CP] Embed Pods Frameworks */, - F88445D630091F1AA9A2F89A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -380,6 +377,7 @@ developmentRegion = English; hasScannedForEncodings = 0; knownRegions = ( + English, en, fr, pt, @@ -438,49 +436,22 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 64D1E44DFBE2976FB9C75718 /* [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-PhotoBrowserDemo/Pods-PhotoBrowserDemo-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 9FEC6B6CD1E66BC894CF44FA /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PhotoBrowserDemo-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"; - showEnvVarsInLog = 0; - }; - F88445D630091F1AA9A2F89A /* [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-PhotoBrowserDemo/Pods-PhotoBrowserDemo-resources.sh\"\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 */ @@ -621,7 +592,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "PhotoBrowserDemo/PhotoBrowserDemo-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0.1; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "../**"; WRAPPER_EXTENSION = app; @@ -645,7 +616,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.appkraft.${PRODUCT_NAME:rfc1034identifier}"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "PhotoBrowserDemo/PhotoBrowserDemo-Bridging-Header.h"; - SWIFT_VERSION = 3.0.1; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = "../**"; WRAPPER_EXTENSION = app; diff --git a/Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..919434a6 --- /dev/null +++ b/Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Demo/PhotoBrowserDemo.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Demo/PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme b/Demo/PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme new file mode 100644 index 00000000..8ae92109 --- /dev/null +++ b/Demo/PhotoBrowserDemo.xcodeproj/xcshareddata/xcschemes/PhotoBrowserDemo.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Demo/PhotoBrowserDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Demo/PhotoBrowserDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/Demo/PhotoBrowserDemo.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Demo/PhotoBrowserDemo/AppDelegate.swift b/Demo/PhotoBrowserDemo/AppDelegate.swift index 563d9876..40cdb5ac 100644 --- a/Demo/PhotoBrowserDemo/AppDelegate.swift +++ b/Demo/PhotoBrowserDemo/AppDelegate.swift @@ -17,7 +17,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // MARK: - Application State extension AppDelegate { - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { self.window = UIWindow.init(frame: UIScreen.main.bounds) diff --git a/Demo/PhotoBrowserDemo/MenuViewController.swift b/Demo/PhotoBrowserDemo/MenuViewController.swift index b14abd26..41983cfc 100644 --- a/Demo/PhotoBrowserDemo/MenuViewController.swift +++ b/Demo/PhotoBrowserDemo/MenuViewController.swift @@ -59,7 +59,7 @@ extension MenuViewController { // MARK: Actions extension MenuViewController { - func buttonWithImageOnScreenPressed(sender: AnyObject) { + @objc func buttonWithImageOnScreenPressed(sender: AnyObject) { let buttonSender = sender as? UIButton // Create an array to store IDMPhoto objects diff --git a/Demo/PhotoBrowserDemo/PhotoBrowserDemo-Bridging-Header.h b/Demo/PhotoBrowserDemo/PhotoBrowserDemo-Bridging-Header.h index 6d4b5549..e80db944 100644 --- a/Demo/PhotoBrowserDemo/PhotoBrowserDemo-Bridging-Header.h +++ b/Demo/PhotoBrowserDemo/PhotoBrowserDemo-Bridging-Header.h @@ -2,5 +2,5 @@ // Use this file to import your target's public headers that you would like to expose to Swift. // -#import "Menu.h" +//#import "Menu.h" #import "IDMPhotoBrowser.h" diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock index 08ad9620..4838f66d 100644 --- a/Demo/Podfile.lock +++ b/Demo/Podfile.lock @@ -1,20 +1,26 @@ PODS: - DACircularProgress (2.3.1) - - pop (1.0.9) - - SDWebImage (4.0.0): - - SDWebImage/Core (= 4.0.0) - - SDWebImage/Core (4.0.0) + - pop (1.0.12) + - SDWebImage (5.0.6): + - SDWebImage/Core (= 5.0.6) + - SDWebImage/Core (5.0.6) DEPENDENCIES: - DACircularProgress - pop - SDWebImage +SPEC REPOS: + https://github.com/cocoapods/specs.git: + - DACircularProgress + - pop + - SDWebImage + SPEC CHECKSUMS: DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71 - pop: f667631a5108a2e60d9e8797c9b32ddaf2080bce - SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41 + pop: d582054913807fd11fd50bfe6a539d91c7e1a55a + SDWebImage: 920f1a2ff1ca8296ad34f6e0510a1ef1d70ac965 PODFILE CHECKSUM: 7c9b8bb160246eb04b56feab0ec4a8fb149d5fa3 -COCOAPODS: 1.2.0 +COCOAPODS: 1.7.4