Skip to content

Commit 4b89976

Browse files
claywilkinsonclaywilkinson
committed
Version 1.0.2
Fixes iOs plugin to not extend UnityAppController
2 parents 674dc9c + 1c33763 commit 4b89976

14 files changed

+659
-378
lines changed

Diff for: ‎GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml

-25
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,11 @@
33
<!-- See https://github.com/googlesamples/unity-jar-resolver#usage for
44
how to configure dependencies -->
55
<androidPackages>
6-
<!-- Internal library dependency. -->
7-
<androidPackage spec="com.google.signin:google-signin-support:1+">
8-
<repositories>
9-
<repository>Assets/GoogleSignIn/Editor/m2repository</repository>
10-
</repositories>
11-
</androidPackage>
12-
<!--- Auth THIS IS ALWAYS REQUIRED -->
13-
<!-- The dependency is actually on 10.2, but 10+ is close enough.
14-
If you have problems, please change this to a concrete value.
15-
-->
166
<androidPackage spec="com.google.android.gms:play-services-auth:10+">
177
<androidSdkPackageIds>
188
<androidSdkPackageId>extra-google-m2repository</androidSdkPackageId>
199
</androidSdkPackageIds>
2010
</androidPackage>
21-
22-
<!-- IF YOU ARE USING THE GAMES_CONFIG TO SIGN-IN, YOU NEED TO
23-
UNCOMMENT THIS DEPENDENCY!!
24-
25-
This is only used if you need to add play-services-games to your
26-
project.
27-
-->
28-
<!--
29-
<androidPackage spec="com.google.android.gms:play-services-games:10+">
30-
<androidSdkPackageIds>
31-
<androidSdkPackageId>extra-google-m2repository</androidSdkPackageId>
32-
</androidSdkPackageIds>
33-
</androidPackage>
34-
-->
35-
3611
</androidPackages>
3712

3813
<!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->

Diff for: ‎GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml.meta

+10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
2+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar
3+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.md5
4+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.sha1
5+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom
6+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.md5
7+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.sha1
8+
Assets/GoogleSignIn/Future.cs
9+
Assets/GoogleSignIn/GoogleSignIn.cs
10+
Assets/GoogleSignIn/GoogleSignInConfiguration.cs
11+
Assets/GoogleSignIn/GoogleSignInStatusCode.cs
12+
Assets/GoogleSignIn/GoogleSignInUser.cs
13+
Assets/GoogleSignIn/Impl/BaseObject.cs
14+
Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
15+
Assets/GoogleSignIn/Impl/NativeFuture.cs
16+
Assets/GoogleSignIn/Impl/SignInHelperObject.cs
17+
Assets/Parse/LICENSE
18+
Assets/Parse/Plugins/Unity.Compat.dll
19+
Assets/Parse/Plugins/Unity.Tasks.dll
20+
Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll
21+
Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll
22+
Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
23+
Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll
24+
Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt
25+
Assets/Plugins/Android/native-googlesignin-release.aar
26+
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h
27+
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm

Diff for: ‎GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignIn.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static GoogleSignIn() {
6666
public static GoogleSignInConfiguration Configuration {
6767
set {
6868
// Can set the configuration until the singleton is created.
69-
if (theInstance == null || theConfiguration == value) {
69+
if (theInstance == null || theConfiguration == value || theConfiguration == null) {
7070
theConfiguration = value;
7171
} else {
7272
throw new SignInException(GoogleSignInStatusCode.DeveloperError,
@@ -141,6 +141,7 @@ public Task<GoogleSignInUser> SignInSilently() {
141141
/// account to use when signing in.
142142
/// </remarks>
143143
public void SignOut() {
144+
theConfiguration = null;
144145
impl.SignOut();
145146
}
146147

Diff for: ‎GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* Copyright 2017 Google Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
#import <GoogleSignIn/GIDSignIn.h>
17+
@interface GoogleSignInHandler
18+
: NSObject <GIDSignInDelegate, GIDSignInUIDelegate>
19+
20+
@end

Diff for: ‎GoogleSignInPlugin/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h.meta

+35
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)