From a4a7135578cd3026277a06ed2224d7ed7e2d18cf Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Sat, 20 Oct 2018 11:15:11 +0200 Subject: [PATCH] Build project on Xcode 10 / Swift 4.2 --- ImageScout-Mac/Info.plist | 2 +- ImageScout-iOS/Info.plist | 2 +- ImageScout.xcodeproj/project.pbxproj | 26 +++++++++---------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++ .../xcschemes/ImageScout-Mac.xcscheme | 4 +-- .../xcschemes/ImageScout-iOS.xcscheme | 4 +-- 6 files changed, 25 insertions(+), 21 deletions(-) create mode 100644 ImageScout.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/ImageScout-Mac/Info.plist b/ImageScout-Mac/Info.plist index a019127..ea4c2a3 100644 --- a/ImageScout-Mac/Info.plist +++ b/ImageScout-Mac/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 62 + 64 NSHumanReadableCopyright Copyright © 2016 Kaishin & Co. All rights reserved. NSPrincipalClass diff --git a/ImageScout-iOS/Info.plist b/ImageScout-iOS/Info.plist index 34da4ce..ad71453 100644 --- a/ImageScout-iOS/Info.plist +++ b/ImageScout-iOS/Info.plist @@ -19,7 +19,7 @@ CFBundleSignature ???? CFBundleVersion - 62 + 64 NSPrincipalClass diff --git a/ImageScout.xcodeproj/project.pbxproj b/ImageScout.xcodeproj/project.pbxproj index 6be1dfd..8db7b43 100644 --- a/ImageScout.xcodeproj/project.pbxproj +++ b/ImageScout.xcodeproj/project.pbxproj @@ -247,16 +247,16 @@ attributes = { LastSwiftMigration = 0700; LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0920; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = "Kaishin & Co"; TargetAttributes = { 005452821C5EAE72005D56E3 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0920; + LastSwiftMigration = ""; }; 9D52341E19DE0A4A00FEE5AC = { CreatedOnToolsVersion = 6.0; - LastSwiftMigration = 0920; + LastSwiftMigration = ""; TestTargetID = 9D52340919DE0A4900FEE5AC; }; EAF49B901A3600E300B395DF = { @@ -408,8 +408,7 @@ PRODUCT_NAME = ImageScout; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -439,8 +438,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -458,12 +456,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -513,12 +513,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = 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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -560,8 +562,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "co.kaishin.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -574,8 +575,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "co.kaishin.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -602,7 +602,7 @@ PRODUCT_NAME = ImageScout; SKIP_INSTALL = YES; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -628,7 +628,7 @@ SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; diff --git a/ImageScout.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ImageScout.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ImageScout.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-Mac.xcscheme b/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-Mac.xcscheme index 16ca72a..6c072ea 100644 --- a/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-Mac.xcscheme +++ b/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-Mac.xcscheme @@ -1,6 +1,6 @@ @@ -37,7 +36,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-iOS.xcscheme b/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-iOS.xcscheme index b95b1dc..fe89fbc 100644 --- a/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-iOS.xcscheme +++ b/ImageScout.xcodeproj/xcshareddata/xcschemes/ImageScout-iOS.xcscheme @@ -1,6 +1,6 @@