From ad01eee3c3f91bd181f7f4eba7f48f7cb211b51c Mon Sep 17 00:00:00 2001 From: Andreas Schlemmer Date: Sat, 5 Dec 2020 10:15:00 +0100 Subject: [PATCH] ARM support --- .travis.yml | 6 +++--- CocoaImageHashing.xcodeproj/project.pbxproj | 7 +++---- .../xcschemes/CocoaImageHashing (iOS Framework).xcscheme | 2 +- .../CocoaImageHashing (iOS Static Library).xcscheme | 2 +- .../xcschemes/CocoaImageHashing (macOS Framework).xcscheme | 2 +- .../CocoaImageHashing (macOS Static Library).xcscheme | 2 +- .../xcschemes/CocoaImageHashing (tvOS Framework).xcscheme | 2 +- .../CocoaImageHashing (tvOS Static Library).xcscheme | 2 +- .../CocoaImageHashing (watchOS Framework).xcscheme | 2 +- .../CocoaImageHashing (watchOS Static Library).xcscheme | 2 +- .../CocoaImageHashingTests (iOS Framework).xcscheme | 2 +- .../CocoaImageHashingTests (macOS Framework).xcscheme | 2 +- .../CocoaImageHashingTests (tvOS Framework).xcscheme | 2 +- .../CocoaImageHashingTests (watchOS Framework).xcscheme | 2 +- 14 files changed, 18 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b72883..1a60901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ -osx_image: xcode12 +osx_image: xcode12.2 language: objective-c before_install: - gem install cocoapods script: - set -o pipefail - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(macOS\ Framework\) clean build test CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty - - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(iOS\ Framework\) -destination "OS=14,name=iPhone 11" clean build test CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty - - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(tvOS\ Framework\) -destination "OS=14,name=Apple TV 4K" clean build test CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty + - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(iOS\ Framework\) -destination "OS=14.2,name=iPhone 11" clean build test CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty + - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(tvOS\ Framework\) -destination "OS=14.2,name=Apple TV 4K" clean build test CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(watchOS\ Framework\) clean build CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(macOS\ Static\ Library\) clean build CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty - xcodebuild -configuration Release -scheme CocoaImageHashing\ \(iOS\ Static\ Library\) clean build CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY="" ENABLE_TESTABILITY=YES GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty diff --git a/CocoaImageHashing.xcodeproj/project.pbxproj b/CocoaImageHashing.xcodeproj/project.pbxproj index 285132b..a178784 100644 --- a/CocoaImageHashing.xcodeproj/project.pbxproj +++ b/CocoaImageHashing.xcodeproj/project.pbxproj @@ -1833,7 +1833,7 @@ CADF6BA91BC8EF9A0039E5A8 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1200; + LastUpgradeCheck = 1220; ORGANIZATIONNAME = "Andreas Meingast"; TargetAttributes = { CA74137C1BD0E5D200C816B5 = { @@ -2508,9 +2508,8 @@ GCC_WARN_UNUSED_PARAMETER = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = ( "-Wno-gnu", "-Wno-static-in-inline", @@ -2607,7 +2606,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LLVM_LTO = YES; - MACOSX_DEPLOYMENT_TARGET = 10.10; + MACOSX_DEPLOYMENT_TARGET = 10.9; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CFLAGS = ( "-Wno-gnu", diff --git a/CocoaImageHashing.xcodeproj/xcshareddata/xcschemes/CocoaImageHashing (iOS Framework).xcscheme b/CocoaImageHashing.xcodeproj/xcshareddata/xcschemes/CocoaImageHashing (iOS Framework).xcscheme index f8995f0..bc058bc 100644 --- a/CocoaImageHashing.xcodeproj/xcshareddata/xcschemes/CocoaImageHashing (iOS Framework).xcscheme +++ b/CocoaImageHashing.xcodeproj/xcshareddata/xcschemes/CocoaImageHashing (iOS Framework).xcscheme @@ -1,6 +1,6 @@