diff --git a/CalSmokeApp/CalSmokeApp/OpenGL/Math/CC3Math.m b/CalSmokeApp/CalSmokeApp/OpenGL/Math/CC3Math.m index 65980e92..68eaf766 100755 --- a/CalSmokeApp/CalSmokeApp/OpenGL/Math/CC3Math.m +++ b/CalSmokeApp/CalSmokeApp/OpenGL/Math/CC3Math.m @@ -59,7 +59,7 @@ float CyclicDifference(float minuend, float subtrahend, float period) { #define kRandomUIntMax 0x100000000LL -unsigned int RandomUInt() { +unsigned int RandomUInt(void) { return arc4random(); } @@ -67,7 +67,7 @@ unsigned int RandomUIntBelow(unsigned int max) { return RandomUInt() % max; } -double RandomDouble() { +double RandomDouble(void) { return (double)RandomUInt() / (double)kRandomUIntMax; } @@ -75,7 +75,7 @@ unsigned int RandomUIntBelow(unsigned int max) { return min + (RandomDouble() * (max - min)); } -float RandomFloat() { +float RandomFloat(void) { return (float)RandomDouble(); } diff --git a/CalSmokeApp/CalSmokeApp/Views/CalDatePickerView.m b/CalSmokeApp/CalSmokeApp/Views/CalDatePickerView.m index 36382395..aa2ba93e 100644 --- a/CalSmokeApp/CalSmokeApp/Views/CalDatePickerView.m +++ b/CalSmokeApp/CalSmokeApp/Views/CalDatePickerView.m @@ -298,6 +298,7 @@ - (NSString *) accessibilityIdentifierForMode:(UIDatePickerMode) aMode { case UIDatePickerModeDate: return @"date picker"; case UIDatePickerModeDateAndTime: return @"date and time picker"; case UIDatePickerModeTime: return @"time picker"; + case UIDatePickerModeYearAndMonth: return @"year and month picker"; } } @@ -309,6 +310,7 @@ - (NSString *) stringForDate:(NSDate *)aDate withMode:(UIDatePickerMode) aMode { case UIDatePickerModeDate: { fmt = [self stringForDateFormat]; break;} case UIDatePickerModeDateAndTime: { fmt = [self stringForDateTimeFormat]; break;} case UIDatePickerModeTime: { fmt = [self stringForTimeFormat]; break; } + case UIDatePickerModeYearAndMonth: { break; } } NSDateFormatter *df = [self dateFormatterWithFormat:fmt]; @@ -322,6 +324,7 @@ - (NSString *) accessibilityIdentifierForPickerWithMode:(UIDatePickerMode) aMode case UIDatePickerModeDate: return @"date"; case UIDatePickerModeDateAndTime: return @"date and time"; case UIDatePickerModeTime: return @"time"; + case UIDatePickerModeYearAndMonth: return @"year and month"; } } diff --git a/CalSmokeApp/bin/make/app-cal.sh b/CalSmokeApp/bin/make/app-cal.sh index 92276f1a..07e02ee5 100755 --- a/CalSmokeApp/bin/make/app-cal.sh +++ b/CalSmokeApp/bin/make/app-cal.sh @@ -57,8 +57,6 @@ if [ -z "${CODE_SIGN_IDENTITY}" ]; then -target "${XC_TARGET}" \ -configuration "${XC_CONFIG}" \ -sdk iphonesimulator \ - ARCHS="i386 x86_64" \ - VALID_ARCHS="i386 x86_64" \ ONLY_ACTIVE_ARCH=NO \ build | $XC_PIPE else @@ -73,8 +71,6 @@ else -target "${XC_TARGET}" \ -configuration "${XC_CONFIG}" \ -sdk iphonesimulator \ - ARCHS="i386 x86_64" \ - VALID_ARCHS="i386 x86_64" \ ONLY_ACTIVE_ARCH=NO \ build | $XC_PIPE fi diff --git a/CalSmokeApp/bin/make/ipa-cal.sh b/CalSmokeApp/bin/make/ipa-cal.sh index 87d2e878..f81c3640 100755 --- a/CalSmokeApp/bin/make/ipa-cal.sh +++ b/CalSmokeApp/bin/make/ipa-cal.sh @@ -57,8 +57,6 @@ if [ "${PREPARE_XTC_ONLY}" != "1" ]; then -scheme "${XC_TARGET}" \ -configuration "${XC_CONFIG}" \ -sdk iphoneos \ - ARCHS="armv7 armv7s arm64" \ - VALID_ARCHS="armv7 armv7s arm64" \ ONLY_ACTIVE_ARCH=NO \ build | $XC_PIPE diff --git a/CalSmokeApp/ios-smoke-test-app.xcodeproj/project.pbxproj b/CalSmokeApp/ios-smoke-test-app.xcodeproj/project.pbxproj index 3afa3a8d..78b122c6 100644 --- a/CalSmokeApp/ios-smoke-test-app.xcodeproj/project.pbxproj +++ b/CalSmokeApp/ios-smoke-test-app.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 54; objects = { /* Begin PBXAggregateTarget section */ @@ -602,7 +602,7 @@ isa = PBXProject; attributes = { CLASSPREFIX = Cal; - LastUpgradeCheck = 1330; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = Calabash; TargetAttributes = { F52BFB0B1987EF8700299AEF = { @@ -715,6 +715,7 @@ /* Begin PBXShellScriptBuildPhase section */ F51F2E8E1AB359A6002326D0 /* Run Script Add Calabash dylibs to Bundle */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -730,6 +731,7 @@ }; F51FA0E31BC569BA00B6BF70 /* Run Script Stage Binaries to Products/ */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -745,6 +747,7 @@ }; F51FA0E41BC5723900B6BF70 /* Run Script Stage Binaries to Products */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -755,11 +758,12 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "bin/xcode-build-phase/stage-CalSmoke-products.sh"; + shellScript = "bin/xcode-build-phase/stage-CalSmoke-products.sh\n"; showEnvVarsInLog = 0; }; F5529E6D1FFCD71300A6F861 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -769,7 +773,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "bin/xcode-build-phase/increment-build-number.sh"; + shellScript = "bin/xcode-build-phase/increment-build-number.sh\n"; showEnvVarsInLog = 0; }; F574ED101D9283860040AF2E /* Run Script Integrate Reveal */ = { @@ -789,6 +793,7 @@ }; F574ED111D9286380040AF2E /* Run Script Integrate Reveal */ = { isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; buildActionMask = 2147483647; files = ( ); @@ -1137,7 +1142,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1193,7 +1198,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/CalSmokeApp/ios-smoke-test-app.xcodeproj/xcshareddata/xcschemes/CalSmoke-cal.xcscheme b/CalSmokeApp/ios-smoke-test-app.xcodeproj/xcshareddata/xcschemes/CalSmoke-cal.xcscheme index 3a357489..601d7611 100644 --- a/CalSmokeApp/ios-smoke-test-app.xcodeproj/xcshareddata/xcschemes/CalSmoke-cal.xcscheme +++ b/CalSmokeApp/ios-smoke-test-app.xcodeproj/xcshareddata/xcschemes/CalSmoke-cal.xcscheme @@ -1,6 +1,6 @@