Skip to content

Commit 269313c

Browse files
author
cynthiajiang
committed
Integrate Latest @ 260187020
Changes to all ... - Update Firebase Unity SDK to use Xcode 10.1 for building rather thanXcode 9.4.1, which is now deprecated by Apple and will be removed shortly. Changes to dynamic_links/testapp ... - Switch Dynamic Links to use Domain URI Prefix rather than Dynamic Links Domain, which is now marked as deprecated. This allows custom domains to be used. CL: 260187020
1 parent 30f2a3f commit 269313c

File tree

11 files changed

+41
-33
lines changed

11 files changed

+41
-33
lines changed

Diff for: analytics/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ with the
99
## Requirements
1010

1111
* [Unity](http://unity3d.com/) 5.3 or higher.
12-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
12+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1313
(when developing for iOS).
1414
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1515
(when developing for Android).

Diff for: auth/testapp/Assets/Firebase/Sample/Auth/UIHandler.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,11 @@ protected virtual void Update() {
113113
}
114114

115115
void OnDestroy() {
116-
auth.StateChanged -= AuthStateChanged;
117-
auth.IdTokenChanged -= IdTokenChanged;
118-
auth = null;
116+
if (auth != null) {
117+
auth.StateChanged -= AuthStateChanged;
118+
auth.IdTokenChanged -= IdTokenChanged;
119+
auth = null;
120+
}
119121
if (otherAuth != null) {
120122
otherAuth.StateChanged -= AuthStateChanged;
121123
otherAuth.IdTokenChanged -= IdTokenChanged;

Diff for: auth/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ with the
1010
## Requirements
1111

1212
* [Unity](http://unity3d.com/) 5.3 or higher.
13-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
13+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1414
(when developing for iOS).
1515
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1616
(when developing for Android).

Diff for: crashlytics/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inside the Unity Editor.
99
## Requirements
1010

1111
* [Unity](http://unity3d.com/) 5.3 or higher
12-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
12+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1313
(when developing for iOS).
1414
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1515
(when developing for Android).

Diff for: database/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inside the Unity Editor.
99
## Requirements
1010

1111
* [Unity](http://unity3d.com/) 5.3 or higher.
12-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
12+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1313
(when developing for iOS).
1414
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1515
(when developing for Android).

Diff for: dynamic_links/testapp/Assets/Firebase/Sample/DynamicLinks/UIHandler.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,19 @@ public class UIHandler : MonoBehaviour {
3434
private string logText = "";
3535
const int kMaxLogSize = 16382;
3636
DependencyStatus dependencyStatus = DependencyStatus.UnavailableOther;
37-
const string kInvalidDynamicLinksDomain = "THIS_IS_AN_INVALID_DOMAIN";
38-
const string kDynamicLinksDomainInvalidError =
39-
"kDynamicLinksDomain is not valid, link shortening will fail.\n" +
37+
const string kInvalidDomainUriPrefix = "THIS_IS_AN_INVALID_DOMAIN";
38+
const string kDomainUriPrefixInvalidError =
39+
"kDomainUriPrefix is not valid, link shortening will fail.\n" +
4040
"To resolve this:\n" +
4141
"* Goto the Firebase console https://firebase.google.com/console/\n" +
4242
"* Click on the Dynamic Links tab\n" +
4343
"* Copy the domain e.g x20yz.app.goo.gl\n" +
44-
"* Replace the value of kDynamicLinksDomain with the copied domain.\n";
44+
"* Replace the value of kDomainUriPrefix with the copied domain.\n";
4545
public bool firebaseInitialized = false;
4646

4747
// IMPORTANT: You need to set this to a valid domain from the Firebase
48-
// console (see kDynamicLinksDomainInvalidError for the details).
49-
public string kDynamicLinksDomain = "fwk68.app.goo.gl";
48+
// console (see kDomainUriPrefixInvalidError for the details).
49+
public string kDomainUriPrefix = "https://fwk68.app.goo.gl";
5050

5151
// When the app starts, check to make sure that we have
5252
// the required dependencies to use Firebase, and if not,
@@ -126,7 +126,7 @@ DynamicLinkComponents CreateDynamicLinkComponents() {
126126
// The base Link.
127127
new System.Uri("https://google.com/abc"),
128128
// The dynamic link domain.
129-
kDynamicLinksDomain) {
129+
kDomainUriPrefix) {
130130
GoogleAnalyticsParameters = new Firebase.DynamicLinks.GoogleAnalyticsParameters() {
131131
Source = "mysource",
132132
Medium = "mymedium",
@@ -176,10 +176,10 @@ public Task<ShortDynamicLink> CreateAndDisplayUnguessableShortLinkAsync() {
176176
}
177177

178178
private Task<ShortDynamicLink> CreateAndDisplayShortLinkAsync(DynamicLinkOptions options) {
179-
if (kDynamicLinksDomain == kInvalidDynamicLinksDomain) {
180-
DebugLog(kDynamicLinksDomainInvalidError);
179+
if (kDomainUriPrefix == kInvalidDomainUriPrefix) {
180+
DebugLog(kDomainUriPrefixInvalidError);
181181
var source = new TaskCompletionSource<ShortDynamicLink>();
182-
source.TrySetException(new Exception(kDynamicLinksDomainInvalidError));
182+
source.TrySetException(new Exception(kDomainUriPrefixInvalidError));
183183
return source.Task;
184184
}
185185

Diff for: dynamic_links/testapp/readme.md

+18-12
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using the
1010
## Requirements
1111

1212
* [Unity](http://unity3d.com/) 5.3 or higher.
13-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
13+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1414
(when developing for iOS).
1515
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1616
(when developing for Android).
@@ -76,10 +76,13 @@ using the
7676
- In the `Player Settings` panel scroll down to `Bundle Identifier`
7777
and update the value to the package name you provided when you
7878
registered your app with Firebase.
79-
- Copy the dynamic links domain for your project under the Dynamic Links
80-
tab of the [Firebase console](https://firebase.google.com/console/)
81-
e.g xyz.app.goo.gl and assign it to the string DynamicLinksDomain on
82-
the UIHandler object in the MainScene.
79+
- Copy the dynamic links domain URI prefix for your project under the Dynamic
80+
Links tab of the [Firebase console](https://firebase.google.com/console/)
81+
e.g xyz.app.goo.gl and assign it to the string DomainUriPrefix on the
82+
UIHandler object in the MainScene.
83+
- Optional: If you want to use a custom Dynamic Links domain, follow
84+
[these instructions](https://firebase.google.com/docs/dynamic-links/custom-domains)
85+
to set up the domain in Firebase console and in your project's Info.plist.
8386
- Build for iOS
8487
- Select the `File > Build Settings` menu option.
8588
- Select `iOS` in the `Platform` list.
@@ -92,9 +95,9 @@ using the
9295
Google Sign-In to send invites).
9396
You can enable this capability on your project in Xcode 8 by going to
9497
your project's settings, Capabilities, and turning on Keychain Sharing.
95-
- Copy the dynamic links domain for your project under the Dynamic Links
96-
tab of the [Firebase console](https://firebase.google.com/console/)
97-
Then, in your project's Capabilities tab:
98+
- Copy the domain URI prefix for your project under the Dynamic Links tab of
99+
the [Firebase console](https://firebase.google.com/console/) Then, in your
100+
project's Capabilities tab:
98101
- Enable the Associated Domains capability.
99102
- Add applinks:YOUR_DYNAMIC_LINKS_DOMAIN
100103
For example "applinks:xyz.app.goo.gl".
@@ -170,10 +173,13 @@ using the
170173
- In the `Player Settings` panel scroll down to `Bundle Identifier`
171174
and update the value to the package name you provided when you
172175
registered your app with Firebase.
173-
- Copy the dynamic links domain for your project under the Dynamic Links
174-
tab of the [Firebase console](https://firebase.google.com/console/)
175-
e.g xyz.app.goo.gl and assign it to the string DynamicLinksDomain on
176-
the UIHandler object in the MainScene.
176+
- Copy the dynamic links domain URI prefix for your project under the Dynamic
177+
Links tab of the [Firebase console](https://firebase.google.com/console/)
178+
e.g xyz.app.goo.gl and assign it to the string DomainUriPrefix on the
179+
UIHandler object in the MainScene.
180+
- Optional: If you want to use a custom Dynamic Links domain, follow
181+
[these instructions](https://firebase.google.com/docs/dynamic-links/custom-domains)
182+
to set up the domain in Firebase console.
177183
- Build for Android
178184
- Select the `File > Build Settings` menu option.
179185
- Select `Android` in the `Platform` list.

Diff for: functions/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inside the Unity Editor.
99
## Requirements
1010

1111
* [Unity](http://unity3d.com/) 5.3 or higher.
12-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
12+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1313
(when developing for iOS).
1414
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1515
(when developing for Android).

Diff for: messaging/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using the
1010
## Requirements
1111

1212
* [Unity](http://unity3d.com/) 5.3 or higher.
13-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
13+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1414
(when developing for iOS).
1515
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1616
(when developing for Android).

Diff for: remote_config/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using the
1010
## Requirements
1111

1212
* [Unity](http://unity3d.com/) 5.3 or higher.
13-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
13+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1414
(when developing for iOS).
1515
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1616
(when developing for Android).

Diff for: storage/testapp/readme.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ inside the Unity Editor.
99
## Requirements
1010

1111
* [Unity](http://unity3d.com/) 5.3 or higher.
12-
* [Xcode](https://developer.apple.com/xcode/) 9.4.1 or higher
12+
* [Xcode](https://developer.apple.com/xcode/) 10.1 or higher
1313
(when developing for iOS).
1414
* [Android SDK](https://developer.android.com/studio/index.html#downloads)
1515
(when developing for Android).

0 commit comments

Comments
 (0)