From 9df940a637eabc91fe51a1e0018ccf7cd2115dd4 Mon Sep 17 00:00:00 2001 From: corin8823 Date: Sat, 16 Sep 2017 22:27:33 +0900 Subject: [PATCH] Support xcode9 --- .travis.yml | 2 +- Example/Podfile.lock | 8 +++---- Example/Popover.xcodeproj/project.pbxproj | 22 +++++++++++++++++-- .../xcschemes/PopoverExample.xcscheme | 4 +++- .../xcschemes/PopoverExampleTests.xcscheme | 4 +++- 5 files changed, 31 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2a5f50..4be907c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode8.2 +osx_image: xcode9 language: objective-c install: - gem install cocoapods -v 1.1.1 --no-document diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 41b447d..27e93c3 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,16 +1,16 @@ PODS: - - Popover (1.0.4) + - Popover (1.0.6) DEPENDENCIES: - Popover (from `../`) EXTERNAL SOURCES: Popover: - :path: "../" + :path: ../ SPEC CHECKSUMS: - Popover: b6999e0625b690f455d0bb031b97ff5f39f33a29 + Popover: f811ed4eb4c4843d7bfff357816ed0d97c4ba69e PODFILE CHECKSUM: 6d2f20b0ca605fb4d048b05500bed6d649d9a399 -COCOAPODS: 1.2.0 +COCOAPODS: 1.3.1 diff --git a/Example/Popover.xcodeproj/project.pbxproj b/Example/Popover.xcodeproj/project.pbxproj index 928265e..b46edff 100644 --- a/Example/Popover.xcodeproj/project.pbxproj +++ b/Example/Popover.xcodeproj/project.pbxproj @@ -191,7 +191,7 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0820; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 01A491C91E222AFB007E15FA = { @@ -266,9 +266,12 @@ files = ( ); inputPaths = ( + "${SRCROOT}/Pods/Target Support Files/Pods-PopoverExample/Pods-PopoverExample-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/Popover/Popover.framework", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Popover.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -281,13 +284,16 @@ files = ( ); inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); name = "[CP] Check Pods Manifest.lock"; outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-PopoverExample-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../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 */ @@ -382,14 +388,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -429,14 +441,20 @@ CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; diff --git a/Example/Popover.xcworkspace/xcshareddata/xcschemes/PopoverExample.xcscheme b/Example/Popover.xcworkspace/xcshareddata/xcschemes/PopoverExample.xcscheme index 14013cb..487bdf8 100644 --- a/Example/Popover.xcworkspace/xcshareddata/xcschemes/PopoverExample.xcscheme +++ b/Example/Popover.xcworkspace/xcshareddata/xcschemes/PopoverExample.xcscheme @@ -1,6 +1,6 @@