Skip to content

Commit

Permalink
Updated calabash.xcframework (#112)
Browse files Browse the repository at this point in the history
* Updated calabash.xcframework.

* Updated dependencies in Xcode project.

1. Updated using of Calabash framework binaries for different architectures.
2. Removed RevealServer framework since we don't use it anymore.

* Fixed deprecations.

* Updated project settings.

* Removed CI step for installer bundler 2.2.7.

* Updated Bundler version.

* Updated Bundler version in CalSmokeApp.
  • Loading branch information
IlyaBausovAkvelon authored Jun 22, 2022
1 parent 39b0acf commit fa2a349
Show file tree
Hide file tree
Showing 39 changed files with 94 additions and 818 deletions.
2 changes: 1 addition & 1 deletion CalSmokeApp/CalSmokeApp/CalAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ - (NSString *)simulatorPreferencesPath:(NSString *) aIgnore {

// 4. and unescape spaces, if necessary (i.e. in the simulator)
NSString *unsanitizedPlistPath = [plistRootPath stringByAppendingPathComponent:relativePlistPath];
path = [[unsanitizedPlistPath stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] copy];
path = [[unsanitizedPlistPath stringByRemovingPercentEncoding] copy];
});
NSLog(@"sim pref path = %@", path);
return path;
Expand Down
61 changes: 26 additions & 35 deletions CalSmokeApp/CalSmokeApp/CalDragDropController.m
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,15 @@ - (IBAction)buttonTouchedShowAlert:(id)sender {
@"The title of the default button on the Smoke Test alert.");
NSString *lcancel = NSLocalizedString(@"Cancel",
@"The title of the cancel button on the Smoke Test alert.");

UIAlertView *alert = [[UIAlertView alloc]
initWithTitle:lat
message:lam
delegate:self
cancelButtonTitle:lcancel
otherButtonTitles:lok, nil];
alert.accessibilityIdentifier = @"alert";
[alert show];
UIAlertController *alert = [UIAlertController alertControllerWithTitle:lat message:lam preferredStyle:UIAlertControllerStyleAlert];
[alert addAction:[UIAlertAction actionWithTitle:lcancel
style:UIAlertActionStyleCancel
handler:^(UIAlertAction *action) {}]];
[alert addAction:[UIAlertAction actionWithTitle:lok
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {}]];
alert.view.accessibilityIdentifier = @"alert";
[self presentViewController:alert animated:YES completion:nil];
}

- (IBAction)buttonToucheShowSheet:(id)sender {
Expand All @@ -217,26 +217,28 @@ - (IBAction)buttonToucheShowSheet:(id)sender {
@"The title of the cancel button on the Smoke Test sheet.");
NSString *locDelete = NSLocalizedString(@"Delete",
@"The title of the delete button on the Smoke Test sheet.");
UIAlertController *sheet = [UIAlertController alertControllerWithTitle:locTitle
message:nil
preferredStyle:UIAlertControllerStyleActionSheet];

UIActionSheet *sheet = nil;
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
sheet = [[UIActionSheet alloc]
initWithTitle:locTitle
delegate:self
cancelButtonTitle:nil
destructiveButtonTitle:locDelete
otherButtonTitles:locCancel, nil];
[sheet addAction:[UIAlertAction actionWithTitle:locDelete
style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *action) {}]];
[sheet addAction:[UIAlertAction actionWithTitle:locCancel
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {}]];
} else {
sheet = [[UIActionSheet alloc]
initWithTitle:locTitle
delegate:self
cancelButtonTitle:locCancel
destructiveButtonTitle:locDelete
otherButtonTitles:nil];
[sheet addAction:[UIAlertAction actionWithTitle:locDelete
style:UIAlertActionStyleDestructive
handler:^(UIAlertAction *action) {}]];
[sheet addAction:[UIAlertAction actionWithTitle:locCancel
style:UIAlertActionStyleCancel
handler:^(UIAlertAction *action) {}]];
}

sheet.accessibilityIdentifier = @"sheet";
[sheet showFromTabBar:self.tabBarController.tabBar];
sheet.view.accessibilityIdentifier = @"sheet";
[self.tabBarController presentViewController:sheet animated:YES completion:nil];
}

- (IBAction) buttonTouchedShowOpenGL:(id) sender {
Expand All @@ -251,17 +253,6 @@ - (IBAction) buttonTouchedShowOpenGL:(id) sender {
}];
}

#pragma mark - Alert View Delegate

- (void) alertView:(UIAlertView *) aAlertView clickedButtonAtIndex:(NSInteger) aIndex {
}

#pragma mark - Action Sheet Delegate

- (void) actionSheet:(UIActionSheet *) aActionSheet clickedButtonAtIndex:(NSInteger) aButtonIndex {

}

#pragma mark - Animations

- (void) animateOrangeViewForSeconds:(NSTimeInterval)seconds {
Expand Down
6 changes: 6 additions & 0 deletions CalSmokeApp/CalSmokeApp/Fingertips/MBFingerTipWindow.m
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,12 @@ - (void)sendEvent:(UIEvent *)event
[self removeFingerTipWithHash:touch.hash animated:YES];
break;
}
case UITouchPhaseRegionEntered:
case UITouchPhaseRegionMoved:
case UITouchPhaseRegionExited:
default: {
break;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion CalSmokeApp/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "json", "2.6.1"
# workflow and build tools
gem 'retriable', "2.0.2"
gem 'rake', "13.0.6"
gem 'bundler', "2.3.13"
gem 'bundler', "2.3.15"
gem 'xcpretty', "0.3.0"
gem "xamarin-test-cloud", "2.3.0"
gem 'rspec', "3.11.0"
Expand Down
19 changes: 0 additions & 19 deletions CalSmokeApp/RevealServer.framework/Headers/RevealServer.h

This file was deleted.

Binary file removed CalSmokeApp/RevealServer.framework/Info.plist
Binary file not shown.
6 changes: 0 additions & 6 deletions CalSmokeApp/RevealServer.framework/Modules/module.modulemap

This file was deleted.

Binary file removed CalSmokeApp/RevealServer.framework/RevealServer
Binary file not shown.

This file was deleted.

166 changes: 0 additions & 166 deletions CalSmokeApp/RevealServer.framework/_CodeSignature/CodeResources

This file was deleted.

1 change: 0 additions & 1 deletion CalSmokeApp/calabash.framework/Headers

This file was deleted.

1 change: 0 additions & 1 deletion CalSmokeApp/calabash.framework/Resources

This file was deleted.

1 change: 0 additions & 1 deletion CalSmokeApp/calabash.framework/Versions/0.21.9

This file was deleted.

14 changes: 0 additions & 14 deletions CalSmokeApp/calabash.framework/Versions/A/Headers/CalabashServer.h

This file was deleted.

16 changes: 0 additions & 16 deletions CalSmokeApp/calabash.framework/Versions/A/Headers/LPCORSResponse.h

This file was deleted.

Loading

0 comments on commit fa2a349

Please sign in to comment.