File tree Expand file tree Collapse file tree 6 files changed +25
-6
lines changed Expand file tree Collapse file tree 6 files changed +25
-6
lines changed Original file line number Diff line number Diff line change @@ -88,8 +88,10 @@ const char* kCpuArchitecture = "arm32";
88
88
89
89
#elif defined(__APPLE__)
90
90
const char * kCppRuntimeOrStl = " libcpp" ;
91
- #if FIREBASE_PLATFORM_IOS || FIREBASE_PLATFORM_TVOS
91
+ #if FIREBASE_PLATFORM_IOS
92
92
const char * kOperatingSystem = " ios" ;
93
+ #elif FIREBASE_PLATFORM_TVOS
94
+ const char * kOperatingSystem = " tvos" ;
93
95
#elif FIREBASE_PLATFORM_OSX
94
96
const char * kOperatingSystem = " darwin" ;
95
97
#else
Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ @implementation PhoneListenerDataObjC
58
58
namespace firebase {
59
59
namespace auth {
60
60
61
- static const char * kMockVerificationId = " mock verification id " ;
61
+ static const char * kMockVerificationId = " PhoneAuth not supported on this platform " ;
62
62
63
63
using util::StringFromNSString;
64
64
@@ -507,7 +507,7 @@ void ReauthenticateWithProviderGetCredentialCallback(FIRAuthCredential* _Nullabl
507
507
#else // non-iOS Apple platforms (eg: tvOS)
508
508
Future<SignInResult> future = MakeFuture (&futures, handle);
509
509
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." );
511
511
#endif // FIREBASE_PLATFORM_IOS
512
512
513
513
}
@@ -544,7 +544,7 @@ void ReauthenticateWithProviderGetCredentialCallback(FIRAuthCredential* _Nullabl
544
544
#else // non-iOS Apple platforms (eg: tvOS)
545
545
Future<SignInResult> future = MakeFuture (&futures, handle);
546
546
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." );
548
548
#endif // FIREBASE_PLATFORM_IOS
549
549
}
550
550
Original file line number Diff line number Diff line change 1
1
#! /bin/bash -e
2
2
#
3
3
# 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),
5
5
# it will build universal framework as well
6
6
#
7
7
Original file line number Diff line number Diff line change 1
1
#! /bin/bash -e
2
2
3
3
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."
5
5
exit 1
6
6
fi
7
7
Original file line number Diff line number Diff line change 1
1
#! /bin/bash -e
2
+ #
3
+ # Script to package tvOS XCFrameworks.
4
+ #
2
5
3
6
builtpath=$1
4
7
packagepath=$2
Original file line number Diff line number Diff line change
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
+
1
15
# This file is part of the ios-cmake project. It was retrieved from
2
16
# https://github.com/gerstrong/ios-cmake.git which is a fork of
3
17
# https://github.com/cristeab/ios-cmake.git, which again is a fork of
You can’t perform that action at this time.
0 commit comments