Skip to content

Commit 0079688

Browse files
committed
Merge remote-tracking branch 'remotes/origin/master' into rewrite-main
2 parents 9ee1704 + ce13d39 commit 0079688

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+19
-3501
lines changed

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ matrix:
3838
env: SAMPLE=InAppMessaging
3939
- podfile: inappmessaging/Podfile
4040
env: SAMPLE=Messaging
41-
- podfile: mlvision/Podfile
42-
env: SAMPLE=MLVision
4341
- podfile: performance/Podfile
4442
env: SAMPLE=Performance
4543
- podfile: storage/Podfile

authentication/AuthenticationExample.xcodeproj/project.pbxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 51;
6+
objectVersion = 50;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -598,7 +598,7 @@
598598
EAE4CBEF24855E3E00245E92 /* Debug */ = {
599599
isa = XCBuildConfiguration;
600600
buildSettings = {
601-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
601+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
602602
BUNDLE_LOADER = "$(TEST_HOST)";
603603
CODE_SIGN_STYLE = Automatic;
604604
INFOPLIST_FILE = AuthenticationExampleTests/Info.plist;
@@ -619,7 +619,7 @@
619619
EAE4CBF024855E3E00245E92 /* Release */ = {
620620
isa = XCBuildConfiguration;
621621
buildSettings = {
622-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
622+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
623623
BUNDLE_LOADER = "$(TEST_HOST)";
624624
CODE_SIGN_STYLE = Automatic;
625625
INFOPLIST_FILE = AuthenticationExampleTests/Info.plist;
@@ -640,7 +640,7 @@
640640
EAE4CBF224855E3E00245E92 /* Debug */ = {
641641
isa = XCBuildConfiguration;
642642
buildSettings = {
643-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
643+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
644644
CODE_SIGN_STYLE = Automatic;
645645
INFOPLIST_FILE = AuthenticationExampleUITests/Info.plist;
646646
LD_RUNPATH_SEARCH_PATHS = (
@@ -660,7 +660,7 @@
660660
EAE4CBF324855E3E00245E92 /* Release */ = {
661661
isa = XCBuildConfiguration;
662662
buildSettings = {
663-
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
663+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
664664
CODE_SIGN_STYLE = Automatic;
665665
INFOPLIST_FILE = AuthenticationExampleUITests/Info.plist;
666666
LD_RUNPATH_SEARCH_PATHS = (

authentication/AuthenticationExample/CustomViews/LoginView.swift

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@ import UIKit
1616

1717
/// Login View presented when peforming Email & Password Login Flow
1818
class LoginView: UIView {
19-
var emailTextField: UITextField!
20-
var passwordTextField: UITextField!
19+
var emailTextField: UITextField! {
20+
didSet {
21+
emailTextField.textContentType = .emailAddress
22+
}
23+
}
24+
var passwordTextField: UITextField! {
25+
didSet {
26+
passwordTextField.textContentType = .password
27+
}
28+
}
2129

2230
var emailTopConstraint: NSLayoutConstraint!
2331
var passwordTopConstraint: NSLayoutConstraint!

functions/FunctionsExample/CommentCell.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ - (IBAction)didTapAddMessage:(id)sender {
5555
// [END_EXCLUDE]
5656
}
5757
// [END function_error]
58-
self->_resultField.text = result.data[@"text"];
58+
self->_resultField.text = result.data;
5959
}];
6060
// [END function_add_message]
6161
}

functions/FunctionsExampleSwift/CommentCell.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class CommentCell: MDCCollectionViewCell {
4242
// [END_EXCLUDE]
4343
}
4444
// [END function_error]
45-
if let text = (result?.data as? [String: Any])?["text"] as? String {
45+
if let text = result?.data as? String {
4646
self.resultField.text = text
4747
}
4848
}

mlvision/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 0 additions & 98 deletions
This file was deleted.

mlvision/Assets.xcassets/Contents.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

mlvision/Assets.xcassets/cloud_download.imageset/Contents.json

Lines changed: 0 additions & 22 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)