Skip to content

Commit f453f6c

Browse files
committed
remove native google signin
> convert to direct unity call to java add signin in editor and desktop support
1 parent 970beb2 commit f453f6c

File tree

125 files changed

+853
-7864
lines changed

Some content is hidden

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

125 files changed

+853
-7864
lines changed

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<!-- iOS Cocoapod dependencies can be specified by each iosPod element. -->
1414
<iosPods>
15-
<iosPod name="GoogleSignIn" version=">= 6.0.2" bitcodeEnabled="false"
15+
<iosPod name="GoogleSignIn" version="~> 6.0.2" bitcodeEnabled="false"
1616
minTargetSdk="6.0">
1717
</iosPod>
1818
</iosPods>

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta

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

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml.meta

-10
This file was deleted.

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.0.txt

-21
This file was deleted.

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.0.txt.meta

-12
This file was deleted.

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta

-12
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
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
1+
Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.89.0.dll
2+
Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.89.0.dll
3+
Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll
4+
Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.89.0.dll
5+
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm
6+
Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h
7+
Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h
8+
Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm
179
Assets/Parse/LICENSE
1810
Assets/Parse/Plugins/Unity.Compat.dll
1911
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
12+
Assets/SignInSample/MainScene.unity
13+
Assets/SignInSample/SigninSampleScript.cs
14+
Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs
15+
Assets/GoogleSignIn/Impl/SignInHelperObject.cs
16+
Assets/GoogleSignIn/Impl/NativeFuture.cs
17+
Assets/GoogleSignIn/Impl/BaseObject.cs
18+
Assets/GoogleSignIn/GoogleSignIn.cs
19+
Assets/GoogleSignIn/GoogleSignInConfiguration.cs
20+
Assets/GoogleSignIn/Future.cs
21+
Assets/GoogleSignIn/GoogleSignInUser.cs
22+
Assets/GoogleSignIn/GoogleSignInStatusCode.cs
23+
Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml
24+
Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml
25+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml
26+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5
27+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1
28+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5
29+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1
30+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1
31+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar
32+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom
33+
Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin.txt.meta renamed to GoogleSignInPlugin/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt.meta

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

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support.meta

-10
This file was deleted.

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5.meta

-11
This file was deleted.

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.meta

-11
This file was deleted.

GoogleSignInPlugin/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1.meta

-11
This file was deleted.

GoogleSignInPlugin/Assets/GoogleSignIn/Future.cs.meta

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

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignIn.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ public static GoogleSignInConfiguration Configuration {
8787
public static GoogleSignIn DefaultInstance {
8888
get {
8989
if (theInstance == null) {
90-
#if UNITY_ANDROID || UNITY_IOS
90+
#if UNITY_EDITOR || UNITY_STANDALONE
91+
theInstance = new GoogleSignIn(new GoogleSignInImplEditor(Configuration));
92+
#elif UNITY_ANDROID || UNITY_IOS
9193
theInstance = new GoogleSignIn(new GoogleSignInImpl(Configuration));
9294
#else
9395
theInstance = new GoogleSignIn(null);
@@ -100,7 +102,7 @@ public static GoogleSignIn DefaultInstance {
100102
}
101103
}
102104

103-
internal GoogleSignIn(GoogleSignInImpl impl) {
105+
internal GoogleSignIn(ISignInImpl impl) {
104106
this.impl = impl;
105107
}
106108

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignIn.cs.meta

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

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignInConfiguration.cs

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ public class GoogleSignInConfiguration {
3030
/// See the README for more details.
3131
/// </remarks>
3232
public bool UseGameSignIn = false;
33+
#if UNITY_EDITOR || UNITY_STANDALONE
34+
/// <summary>Client Secret for used in editor and desktop platform</summary>
35+
/// <remarks>Required for requesting auth code or id token in editor</remarks>
36+
public string ClientSecret = null;
37+
#endif
3338
/// <summary>Web client id associated with this app.</summary>
3439
/// <remarks>Required for requesting auth code or id token.</remarks>
3540
public string WebClientId = null;

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta

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

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta

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

GoogleSignInPlugin/Assets/GoogleSignIn/GoogleSignInUser.cs.meta

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

GoogleSignInPlugin/Assets/GoogleSignIn/Impl/BaseObject.cs.meta

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

0 commit comments

Comments
 (0)