Skip to content

Commit f571827

Browse files
committed
addressed code review comments
1 parent 34d5b19 commit f571827

File tree

6 files changed

+25
-6
lines changed

6 files changed

+25
-6
lines changed

app/src/app_common.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,10 @@ const char* kCpuArchitecture = "arm32";
8888

8989
#elif defined(__APPLE__)
9090
const char* kCppRuntimeOrStl = "libcpp";
91-
#if FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
91+
#if FIREBASE_PLATFORM_IOS
9292
const char* kOperatingSystem = "ios";
93+
#elif FIREBASE_PLATFORM_TVOS
94+
const char* kOperatingSystem = "tvos";
9395
#elif FIREBASE_PLATFORM_OSX
9496
const char* kOperatingSystem = "darwin";
9597
#else

auth/src/ios/credential_ios.mm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ @implementation PhoneListenerDataObjC
5858
namespace firebase {
5959
namespace auth {
6060

61-
static const char* kMockVerificationId = "mock verification id";
61+
static const char* kMockVerificationId = "PhoneAuth not supported on this platform";
6262

6363
using util::StringFromNSString;
6464

@@ -507,7 +507,7 @@ void ReauthenticateWithProviderGetCredentialCallback(FIRAuthCredential* _Nullabl
507507
#else // non-iOS Apple platforms (eg: tvOS)
508508
Future<SignInResult> future = MakeFuture(&futures, handle);
509509
futures.Complete(handle, kAuthErrorApiNotAvailable,
510-
"Link with getCredentialWithUIDelegate is not supported on non-iOS Apple platforms.");
510+
"OAuth provider linking is not supported on non-iOS Apple platforms.");
511511
#endif // FIREBASE_PLATFORM_IOS
512512

513513
}
@@ -544,7 +544,7 @@ void ReauthenticateWithProviderGetCredentialCallback(FIRAuthCredential* _Nullabl
544544
#else // non-iOS Apple platforms (eg: tvOS)
545545
Future<SignInResult> future = MakeFuture(&futures, handle);
546546
futures.Complete(handle, kAuthErrorApiNotAvailable,
547-
"Reauthenticate with getCredentialWithUIDelegate is not supported on non-iOS Apple platforms.");
547+
"OAuth reauthentication is not supported on non-iOS Apple platforms.");
548548
#endif // FIREBASE_PLATFORM_IOS
549549
}
550550

build_scripts/tvos/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -e
22
#
33
# Script to build iOS XCFrameworks
4-
# If built for all architectures (arm64 armv7 x86_64 i386),
4+
# If built for all architectures (arm64 x86_64),
55
# it will build universal framework as well
66
#
77

build_scripts/tvos/install_prereqs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -e
22

33
if [[ $(uname) != "Darwin" ]]; then
4-
echo "Unsupported platform, iOS can only be build on a MacOS machine."
4+
echo "Unsupported platform, tvOS can only be build on a MacOS machine."
55
exit 1
66
fi
77

build_scripts/tvos/package.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
#!/bin/bash -e
2+
#
3+
# Script to package tvOS XCFrameworks.
4+
#
25

36
builtpath=$1
47
packagepath=$2

cmake/toolchains/apple.toolchain.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
# This file is part of the ios-cmake project. It was retrieved from
216
# https://github.com/gerstrong/ios-cmake.git which is a fork of
317
# https://github.com/cristeab/ios-cmake.git, which again is a fork of

0 commit comments

Comments
 (0)