Modernise project, add support for Apple Silicon

Cascable · Nov 9, 2020 · 6305d31 · 6305d31
1 parent ee44f65
commit 6305d31
Show file tree

Hide file tree

Showing 16 changed files with 49 additions and 27 deletions.
diff --git a/StopKit.xcodeproj/project.pbxproj b/StopKit.xcodeproj/project.pbxproj
@@ -311,7 +311,7 @@
 		50310A3A1F99D98500D36CE1 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1200;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "Cascable AB";
 				TargetAttributes = {
 					50310A421F99D98500D36CE1 = {
@@ -399,7 +399,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "if [ \"${CARTHAGE}\" = \"YES\" ]\nthen\n    echo \"Building under carthage - skipping universal binary\"\n    exit 0\nfi\n\n\nif [ -z \"${NESTED_BUILD_FLAG}\" ]\nthen\n    echo \"Seem to be clear for nested\"\nelse\n    echo \"Nested build detected - bailing!\"\n    exit 0\nfi\n\nTHIS_HALF_BINARY_PATH=\"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\nSCHEME_NAME=\"StopKit iOS\"\n\nif [ \"${PLATFORM_NAME}\" = \"iphonesimulator\" ]\nthen\n    echo \"We need to build for device!\"\n    xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project \"${PROJECT_NAME}.xcodeproj\" -scheme \"${SCHEME_NAME}\" -sdk iphoneos -configuration \"${CONFIGURATION}\" build CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos\" NESTED_BUILD_FLAG=1 > /dev/null\n\n    OTHER_HALF_BINARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/${EXECUTABLE_PATH}\"\n    OTHER_HALF_ARCHS=(\"armv7 arm64\")\n    THIS_HALF_ARCHS=(\"i386 x86_64\")\n\nelse\n    echo \"We need to build for simulator!\"\n\n    #IMPORTANT: This will come back to bite you in the future:\n    # The -destination 'platform=…OS=latest' part is required due to a bug in Xcode 7.2.\n    # When this workaround breaks the build in the future, you should remove that parameter\n    # first. Sources:\n    # - https://openradar.appspot.com/23857648,\n    # - http://stackoverflow.com/questions/34284835/cannot-build-for-simulator-with-iphonesimulator9-2\n\n    # ALSO the `-UseSanitizedBuildSystemEnvironment=YES` flag is required to stop Xcode spazzing out\n    # about entitlements. It seems building a device binary in a Run Script phase of a simulator build\n    # causes the environment to break. Source:\n    # - https://github.com/Carthage/Carthage/issues/992\n\n    xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project \"${PROJECT_NAME}.xcodeproj\" -scheme \"${SCHEME_NAME}\" -sdk iphonesimulator -configuration \"${CONFIGURATION}\" -destination 'platform=iOS Simulator,name=iPhone 6s,OS=latest' build CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator\" NESTED_BUILD_FLAG=1 > /dev/null\n\n    OTHER_HALF_BINARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${EXECUTABLE_PATH}\"\n    OTHER_HALF_ARCHS=(\"i386 x86_64\")\n    THIS_HALF_ARCHS=(\"armv7 arm64\")\nfi\n\n######################\n# Extract the individual architectures\n######################\n\necho \"This half is at $THIS_HALF_BINARY_PATH\"\necho \"Other half is at $OTHER_HALF_BINARY_PATH\"\n\nEXTRACTED_ARCHS=()\n\necho \"Archs here: $THIS_HALF_ARCHS\"\necho \"Archs there: $OTHER_HALF_ARCHS\"\n\nfor ARCH in $THIS_HALF_ARCHS\ndo\n    echo \"Extracting $ARCH\"\n    lipo -extract \"$ARCH\" \"$THIS_HALF_BINARY_PATH\" -o \"$THIS_HALF_BINARY_PATH-$ARCH\"\n    EXTRACTED_ARCHS+=(\"$THIS_HALF_BINARY_PATH-$ARCH\")\ndone\n\nfor ARCH in $OTHER_HALF_ARCHS\ndo\n    echo \"Extracting $ARCH\"\n    lipo -extract \"$ARCH\" \"$OTHER_HALF_BINARY_PATH\" -o \"$THIS_HALF_BINARY_PATH-$ARCH\"\n    EXTRACTED_ARCHS+=(\"$THIS_HALF_BINARY_PATH-$ARCH\")\ndone\n\n######################\n# Merge the extracted architecture back together\n######################\n\nMERGED_TEMP_BINARY_PATH=\"$THIS_HALF_BINARY_PATH-merged\"\n\necho \"Merging extracted architectures: ${ARCHS}\"\nlipo -o \"$MERGED_TEMP_BINARY_PATH\" -create \"${EXTRACTED_ARCHS[@]}\"\nrm \"${EXTRACTED_ARCHS[@]}\"\n\nrm \"$THIS_HALF_BINARY_PATH\"\nmv \"$MERGED_TEMP_BINARY_PATH\" \"$THIS_HALF_BINARY_PATH\"\n\nlipo -info \"$THIS_HALF_BINARY_PATH\"\n\n";
+			shellScript = "if [ \"${CARTHAGE}\" = \"YES\" ] \nthen\n    echo \"Building under carthage - skipping universal binary\"\n    exit 0\nfi\n\nif [ -z \"${NESTED_BUILD_FLAG}\" ]\nthen\n    echo \"Seem to be clear for nested\"\nelse\n    echo \"Nested build detected - bailing!\"\n    exit 0\nfi\n\nTHIS_HALF_BINARY_PATH=\"${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}\"\nSCHEME_NAME=\"${TARGET_NAME}\"\n\nif [ \"${PLATFORM_NAME}\" = \"iphonesimulator\" ]\nthen\n    echo \"We need to build for device!\"\n    xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project \"${PROJECT_NAME}.xcodeproj\" -scheme \"${SCHEME_NAME}\" -sdk iphoneos -configuration \"${CONFIGURATION}\" build CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos\" NESTED_BUILD_FLAG=1 OBJROOT=\"$OBJROOT/DependentBuilds\" > /dev/null\n\n    OTHER_HALF_BINARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphoneos/${EXECUTABLE_PATH}\"\n    OTHER_HALF_ARCHS=(\"armv7 arm64\")\n    THIS_HALF_ARCHS=(\"x86_64\")\nelse\n    echo \"We need to build for simulator!\"\n\n    #IMPORTANT: This will come back to bite you in the future:\n    # The -destination 'platform=…OS=latest' part is required due to a bug in Xcode 7.2.\n    # When this workaround breaks the build in the future, you should remove that parameter\n    # first. Sources:\n    # - https://openradar.appspot.com/23857648,\n    # - http://stackoverflow.com/questions/34284835/cannot-build-for-simulator-with-iphonesimulator9-2\n\n    # ALSO the `-UseSanitizedBuildSystemEnvironment=YES` flag is required to stop Xcode spazzing out\n    # about entitlements. It seems building a device binary in a Run Script phase of a simulator build\n    # causes the environment to break. Source:\n    # - https://github.com/Carthage/Carthage/issues/992\n\n    xcodebuild -UseSanitizedBuildSystemEnvironment=YES -project \"${PROJECT_NAME}.xcodeproj\" -scheme \"${SCHEME_NAME}\" -sdk iphonesimulator -configuration \"${CONFIGURATION}\" -destination 'platform=iOS Simulator,name=iPhone 8,OS=latest' build CONFIGURATION_BUILD_DIR=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator\" NESTED_BUILD_FLAG=1 OBJROOT=\"$OBJROOT/DependentBuilds\" > /dev/null\n\n    OTHER_HALF_BINARY_PATH=\"${BUILD_DIR}/${CONFIGURATION}-iphonesimulator/${EXECUTABLE_PATH}\"\n    OTHER_HALF_ARCHS=(\"x86_64\")\n    THIS_HALF_ARCHS=(\"armv7 arm64\")\nfi\n\n######################\n# Extract the individual architectures\n######################\n\necho \"This half is at $THIS_HALF_BINARY_PATH\"\necho \"Other half is at $OTHER_HALF_BINARY_PATH\"\n\nEXTRACTED_ARCHS=()\n\necho \"Archs here: $THIS_HALF_ARCHS\"\necho \"Archs there: $OTHER_HALF_ARCHS\"\n\nNUMBER_OF_ARCHS_IN_THIS_HALF=$(wc -w <<< \"$THIS_HALF_ARCHS\" | xargs)\nNUMBER_OF_ARCHS_IN_OTHER_HALF=$(wc -w <<< \"$OTHER_HALF_ARCHS\" | xargs)\n\nif [ $NUMBER_OF_ARCHS_IN_THIS_HALF -eq 1 ]; then\n    echo \"Executable only has one architecture - nothing to do\"\n    cp \"$THIS_HALF_BINARY_PATH\" \"$THIS_HALF_BINARY_PATH-$THIS_HALF_ARCHS\"\n    EXTRACTED_ARCHS+=(\"$THIS_HALF_BINARY_PATH-$THIS_HALF_ARCHS\")\nelse\n    for ARCH in $THIS_HALF_ARCHS\n    do\n        echo \"Extracting $ARCH\"\n        lipo -extract \"$ARCH\" \"$THIS_HALF_BINARY_PATH\" -o \"$THIS_HALF_BINARY_PATH-$ARCH\"\n        EXTRACTED_ARCHS+=(\"$THIS_HALF_BINARY_PATH-$ARCH\")\n    done\nfi\n\nif [ $NUMBER_OF_ARCHS_IN_OTHER_HALF -eq 1 ]; then\n    echo \"Executable only has one architecture - nothing to do\"\n    cp \"$OTHER_HALF_BINARY_PATH\" \"$THIS_HALF_BINARY_PATH-$OTHER_HALF_ARCHS\"\n    EXTRACTED_ARCHS+=(\"$THIS_HALF_BINARY_PATH-$OTHER_HALF_ARCHS\")\nelse\n    for ARCH in $OTHER_HALF_ARCHS\n    do\n        echo \"Extracting $ARCH\"\n        lipo -extract \"$ARCH\" \"$OTHER_HALF_BINARY_PATH\" -o \"$THIS_HALF_BINARY_PATH-$ARCH\"\n        EXTRACTED_ARCHS+=(\"$THIS_HALF_BINARY_PATH-$ARCH\")\n    done\nfi\n\n######################\n# Merge the extracted architecture back together\n######################\n\nMERGED_TEMP_BINARY_PATH=\"$THIS_HALF_BINARY_PATH-merged\"\n\necho \"Merging extracted architectures: ${ARCHS}\"\nlipo -o \"$MERGED_TEMP_BINARY_PATH\" -create \"${EXTRACTED_ARCHS[@]}\"\nrm \"${EXTRACTED_ARCHS[@]}\"\n\nrm \"$THIS_HALF_BINARY_PATH\"\nmv \"$MERGED_TEMP_BINARY_PATH\" \"$THIS_HALF_BINARY_PATH\"\n\nlipo -info \"$THIS_HALF_BINARY_PATH\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -506,6 +506,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -567,6 +568,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -599,6 +601,8 @@
 		50310A4C1F99D98500D36CE1 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				"ARCHS[sdk=iphonesimulator*]" = x86_64;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				DEFINES_MODULE = YES;
@@ -626,6 +630,8 @@
 		50310A4D1F99D98500D36CE1 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				"ARCHS[sdk=iphonesimulator*]" = x86_64;
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Manual;
 				DEFINES_MODULE = YES;
@@ -656,7 +662,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = EB5BP6YJ4R;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
@@ -666,7 +671,6 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = EB5BP6YJ4R;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx;
 			};
 			name = Release;
 		};
@@ -689,6 +693,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = se.cascable.StopKit;
 				PRODUCT_NAME = StopKit;
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/StopKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/StopKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/StopKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/StopKit.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/StopKit.xcodeproj/xcshareddata/xcschemes/StopKit Mac.xcscheme b/StopKit.xcodeproj/xcshareddata/xcschemes/StopKit Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

diff --git a/StopKit.xcodeproj/xcshareddata/xcschemes/StopKit iOS.xcscheme b/StopKit.xcodeproj/xcshareddata/xcschemes/StopKit iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "NO"

diff --git a/StopKit.xcodeproj/xcshareddata/xcschemes/Version Header File Generation.xcscheme b/StopKit.xcodeproj/xcshareddata/xcschemes/Version Header File Generation.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1220"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/StopKit/Aperture/CBLApertureValue.h b/StopKit/Aperture/CBLApertureValue.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "CBLUniversalPropertyValue.h"
+#import <StopKit/CBLUniversalPropertyValue.h>
 
 /** This class represents the aperture "f-stops" exposure property. */
 NS_SWIFT_NAME(ApertureValue)

diff --git a/StopKit/Aperture/CBLAutoApertureValue.h b/StopKit/Aperture/CBLAutoApertureValue.h
@@ -1,4 +1,4 @@
-#import "CBLApertureValue.h"
+#import <StopKit/CBLApertureValue.h>
 
 NS_SWIFT_NAME(AutoApertureValue)
 @interface CBLAutoApertureValue : CBLApertureValue

diff --git a/StopKit/Exposure Compensation/CBLExposureCompensationValue.h b/StopKit/Exposure Compensation/CBLExposureCompensationValue.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import "CBLUniversalPropertyValue.h"
-#import "CBLExposureStops.h"
+#import <StopKit/CBLUniversalPropertyValue.h>
+#import <StopKit/CBLExposureStops.h>
 
 @protocol CBLUniversalExposurePropertyValue;
 

diff --git a/StopKit/ISO/CBLAutoISOValue.h b/StopKit/ISO/CBLAutoISOValue.h
@@ -1,4 +1,4 @@
-#import "CBLISOValue.h"
+#import <StopKit/CBLISOValue.h>
 
 NS_SWIFT_NAME(AutoISOValue)
 @interface CBLAutoISOValue : CBLISOValue

diff --git a/StopKit/ISO/CBLISOValue.h b/StopKit/ISO/CBLISOValue.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "CBLUniversalPropertyValue.h"
+#import <StopKit/CBLUniversalPropertyValue.h>
 
 /** This class represents the ISO exposure property. */
 NS_SWIFT_NAME(ISOValue)

diff --git a/StopKit/Info-Mac.plist b/StopKit/Info-Mac.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleVersion</key>
 	<string>CBL_STOPKIT_BUNDLE_VERSION</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2017 Cascable AB. All rights reserved.</string>
+	<string>Copyright © 2017-2020 Cascable AB. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/StopKit/Info-iOS.plist b/StopKit/Info-iOS.plist
@@ -17,9 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>1.1</string>
 	<key>CFBundleVersion</key>
 	<string>CBL_STOPKIT_BUNDLE_VERSION</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2017-2020 Cascable AB. All rights reserved.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

diff --git a/StopKit/Shutter Speed/CBLIndeterminateShutterSpeedValue.h b/StopKit/Shutter Speed/CBLIndeterminateShutterSpeedValue.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "CBLShutterSpeedValue.h"
+#import <StopKit/CBLShutterSpeedValue.h>
 
 NS_SWIFT_NAME(IndeterminateShutterSpeedValue)
 @interface CBLIndeterminateShutterSpeedValue : CBLShutterSpeedValue

diff --git a/StopKit/Shutter Speed/CBLShutterSpeedValue.h b/StopKit/Shutter Speed/CBLShutterSpeedValue.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import "CBLUniversalPropertyValue.h"
+#import <StopKit/CBLUniversalPropertyValue.h>
 
 /** This class represents the shutter speed exposure property. */
 NS_SWIFT_NAME(ShutterSpeedValue)

diff --git a/StopKit/StopKit.h b/StopKit/StopKit.h
@@ -1,9 +1,9 @@
-#import "CBLUniversalPropertyValue.h"
-#import "CBLExposureStops.h"
-#import "CBLExposureCompensationValue.h"
-#import "CBLApertureValue.h"
-#import "CBLAutoApertureValue.h"
-#import "CBLShutterSpeedValue.h"
-#import "CBLIndeterminateShutterSpeedValue.h"
-#import "CBLISOValue.h"
-#import "CBLAutoISOValue.h"
+#import <StopKit/CBLUniversalPropertyValue.h>
+#import <StopKit/CBLExposureStops.h>
+#import <StopKit/CBLExposureCompensationValue.h>
+#import <StopKit/CBLApertureValue.h>
+#import <StopKit/CBLAutoApertureValue.h>
+#import <StopKit/CBLShutterSpeedValue.h>
+#import <StopKit/CBLIndeterminateShutterSpeedValue.h>
+#import <StopKit/CBLISOValue.h>
+#import <StopKit/CBLAutoISOValue.h>