Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update of code to support installing on iOS 17 devices #115

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update of code to support installing on iOS 17 devices #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CalSmokeApp/CalSmokeApp/OpenGL/Math/CC3Math.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,23 @@ float CyclicDifference(float minuend, float subtrahend, float period) {

#define kRandomUIntMax 0x100000000LL

unsigned int RandomUInt() {
unsigned int RandomUInt(void) {
return arc4random();
}

unsigned int RandomUIntBelow(unsigned int max) {
return RandomUInt() % max;
}

double RandomDouble() {
double RandomDouble(void) {
return (double)RandomUInt() / (double)kRandomUIntMax;
}

double RandomDoubleBetween(double min, double max) {
return min + (RandomDouble() * (max - min));
}

float RandomFloat() {
float RandomFloat(void) {
return (float)RandomDouble();
}

Expand Down
3 changes: 3 additions & 0 deletions CalSmokeApp/CalSmokeApp/Views/CalDatePickerView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
}

Expand All @@ -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];
Expand All @@ -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";
}
}

Expand Down
4 changes: 0 additions & 4 deletions CalSmokeApp/bin/make/app-cal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 0 additions & 2 deletions CalSmokeApp/bin/make/ipa-cal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
17 changes: 11 additions & 6 deletions CalSmokeApp/ios-smoke-test-app.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {

/* Begin PBXAggregateTarget section */
Expand Down Expand Up @@ -602,7 +602,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = Cal;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = Calabash;
TargetAttributes = {
F52BFB0B1987EF8700299AEF = {
Expand Down Expand Up @@ -715,6 +715,7 @@
/* Begin PBXShellScriptBuildPhase section */
F51F2E8E1AB359A6002326D0 /* Run Script Add Calabash dylibs to Bundle */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -730,6 +731,7 @@
};
F51FA0E31BC569BA00B6BF70 /* Run Script Stage Binaries to Products/ */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -745,6 +747,7 @@
};
F51FA0E41BC5723900B6BF70 /* Run Script Stage Binaries to Products */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand All @@ -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 = (
);
Expand All @@ -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 */ = {
Expand All @@ -789,6 +793,7 @@
};
F574ED111D9286380040AF2E /* Run Script Integrate Reveal */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion CalSmokeApp/ios-smoke-test-app.xcodeproj/xcshareddata/xcschemes/CalSmoke-cal.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion CalSmokeApp/ios-smoke-test-app.xcodeproj/xcshareddata/xcschemes/CalSmoke.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1330"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down