diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..6f06e774 Binary files /dev/null and b/.DS_Store differ diff --git a/Assets/.DS_Store b/Assets/.DS_Store new file mode 100644 index 00000000..b1beea3f Binary files /dev/null and b/Assets/.DS_Store differ diff --git a/Assets/GoogleService-Info.plist b/Assets/GoogleService-Info.plist new file mode 100644 index 00000000..ac4e3875 --- /dev/null +++ b/Assets/GoogleService-Info.plist @@ -0,0 +1,14 @@ + + + + + CLIENT_ID + 1021701058525-vp54583d95oknnamu739smqfihhoivnk.apps.googleusercontent.com + REVERSED_CLIENT_ID + com.googleusercontent.apps.1021701058525-vp54583d95oknnamu739smqfihhoivnk + SERVER_CLIENT_ID + 1021701058525-72qg4sbvqv3m3q7it4eck2h86ekoflla.apps.googleusercontent.com + BUNDLE_ID + com.rizze.pipuzzle + + diff --git a/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta b/Assets/GoogleService-Info.plist.meta similarity index 74% rename from Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta rename to Assets/GoogleService-Info.plist.meta index b7c4cd42..ce608f0c 100644 --- a/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta +++ b/Assets/GoogleService-Info.plist.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a55ee4efaad27d948ba5f03fc6d7bc80 +guid: 1b9e8786ff7ad4966bcef466f4935744 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GoogleSignIn/.DS_Store b/Assets/GoogleSignIn/.DS_Store new file mode 100644 index 00000000..ca77057a Binary files /dev/null and b/Assets/GoogleSignIn/.DS_Store differ diff --git a/Assets/GoogleSignIn/Editor/.DS_Store b/Assets/GoogleSignIn/Editor/.DS_Store new file mode 100644 index 00000000..4d387c20 Binary files /dev/null and b/Assets/GoogleSignIn/Editor/.DS_Store differ diff --git a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml b/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml index 5aaffe64..821e7dc9 100644 --- a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml +++ b/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml @@ -12,7 +12,7 @@ - diff --git a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta b/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta index 6493d604..298fa3d3 100644 --- a/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta +++ b/Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: 938014c9994164100b26d82840a88fbb labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1507661087 +licenseType: Pro TextScriptImporter: - externalObjects: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml b/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml deleted file mode 100644 index 1ef90349..00000000 --- a/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - Assets/GoogleSignIn/Editor/m2repository - - - - diff --git a/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml.meta b/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml.meta deleted file mode 100644 index 578e49d5..00000000 --- a/Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e8689106c65f445c19cec6044d615c19 -labels: -- gvh -- gvh_version-1.0.4 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt b/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt similarity index 52% rename from Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt rename to Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt index a0e24547..f7061862 100644 --- a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt +++ b/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt @@ -1,33 +1,27 @@ -Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.89.0.dll -Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.89.0.dll -Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll -Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.89.0.dll -Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm -Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h -Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h -Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm -Assets/Parse/LICENSE -Assets/Parse/Plugins/Unity.Compat.dll -Assets/Parse/Plugins/Unity.Tasks.dll -Assets/SignInSample/MainScene.unity -Assets/SignInSample/SigninSampleScript.cs -Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs -Assets/GoogleSignIn/Impl/SignInHelperObject.cs -Assets/GoogleSignIn/Impl/NativeFuture.cs -Assets/GoogleSignIn/Impl/BaseObject.cs +Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml +Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar +Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.md5 +Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.aar.sha1 +Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom +Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.md5 +Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.1/google-signin-support-1.0.1.pom.sha1 +Assets/GoogleSignIn/Future.cs Assets/GoogleSignIn/GoogleSignIn.cs Assets/GoogleSignIn/GoogleSignInConfiguration.cs -Assets/GoogleSignIn/Future.cs -Assets/GoogleSignIn/GoogleSignInUser.cs Assets/GoogleSignIn/GoogleSignInStatusCode.cs -Assets/GoogleSignIn/Editor/GoogleSignInDependencies.xml -Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1 -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom -Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5 +Assets/GoogleSignIn/GoogleSignInUser.cs +Assets/GoogleSignIn/Impl/BaseObject.cs +Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs +Assets/GoogleSignIn/Impl/NativeFuture.cs +Assets/GoogleSignIn/Impl/SignInHelperObject.cs +Assets/Parse/LICENSE +Assets/Parse/Plugins/Unity.Compat.dll +Assets/Parse/Plugins/Unity.Tasks.dll +Assets/PlayServicesResolver/Editor/Google.IOSResolver_v1.2.54.0.dll +Assets/PlayServicesResolver/Editor/Google.JarResolver_v1.2.54.0.dll +Assets/PlayServicesResolver/Editor/Google.VersionHandler.dll +Assets/PlayServicesResolver/Editor/Google.VersionHandlerImpl_v1.2.54.0.dll +Assets/PlayServicesResolver/Editor/play-services-resolver_v1.2.54.0.txt +Assets/Plugins/Android/native-googlesignin-release.aar +Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h +Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm diff --git a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt.meta b/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta similarity index 71% rename from Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt.meta rename to Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta index eb7a5d66..6cffc299 100644 --- a/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.4.txt.meta +++ b/Assets/GoogleSignIn/Editor/google-signin-plugin_v1.0.1.txt.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: a67d5f0cfc09749e6b1ce13e8b8e6e1d +guid: 817a6673340324b8ca85e24466f60953 labels: - gvh - gvh_manifest -- gvh_version-1.0.4 +- gvh_version-1.0.1 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/GoogleSignIn/Editor/m2repository/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/.DS_Store new file mode 100644 index 00000000..35a54bf0 Binary files /dev/null and b/Assets/GoogleSignIn/Editor/m2repository/.DS_Store differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/com/.DS_Store new file mode 100644 index 00000000..b7133245 Binary files /dev/null and b/Assets/GoogleSignIn/Editor/m2repository/com/.DS_Store differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/com/google/.DS_Store new file mode 100644 index 00000000..aceafef8 Binary files /dev/null and b/Assets/GoogleSignIn/Editor/m2repository/com/google/.DS_Store differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/.DS_Store b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/.DS_Store new file mode 100644 index 00000000..f17ea321 Binary files /dev/null and b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/.DS_Store differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4.meta deleted file mode 100644 index 27236f59..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 001a15402063b4df983ba8bc4ddb269f -folderAsset: yes -timeCreated: 1537405253 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom deleted file mode 100644 index ce320d07..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.signin - google-signin-support - 1.0.4 - srcaar - diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5 b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5 deleted file mode 100644 index a6bc0c50..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -7cd48eaf454469c04dae63043d467d69 \ No newline at end of file diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5.meta deleted file mode 100644 index 8209b096..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.md5.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 907bf7a19cd7848cabf1f641f61343ee -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.meta deleted file mode 100644 index 94612747..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: a3f74b3d329a24e81a6c6f9f1d2f46f1 -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1 b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1 deleted file mode 100644 index 8721bf36..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -f30d09407a5b0e439bfc0e54e33f3a34f7c7d35c \ No newline at end of file diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1.meta deleted file mode 100644 index df944c49..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.sha1.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: e1a3ff77f802d43818521ff3db2bf944 -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar deleted file mode 100644 index 1ebd5a13..00000000 Binary files a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar and /dev/null differ diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5 b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5 deleted file mode 100644 index f7df30ce..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5 +++ /dev/null @@ -1 +0,0 @@ -040097cf545e84135c0e4d783e3b1143 \ No newline at end of file diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5.meta deleted file mode 100644 index ee2f55dd..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.md5.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 79f9d122dd99b483282294f3b1f1bd36 -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.meta deleted file mode 100644 index 4ae20ba3..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 6eab7a3cbdbf34cffaf951dc9210a32c -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1 b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1 deleted file mode 100644 index db669bff..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1 +++ /dev/null @@ -1 +0,0 @@ -632874f93336b4f05e15f55b63656dace924fa72 \ No newline at end of file diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1.meta deleted file mode 100644 index 124743a3..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.srcaar.sha1.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: d508eb0e16bb14c8a962b343e755ef01 -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml deleted file mode 100644 index c3049afe..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - com.google.signin - google-signin-support - - 1.0.4 - - 1.0.4 - - 20180920010048 - - diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5 b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5 deleted file mode 100644 index 77f39ed2..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -e243363a85b4f7bd1170918ba674061b \ No newline at end of file diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5.meta deleted file mode 100644 index 49e3156c..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.md5.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: c020582c1a85d47c7934908f00a0bd37 -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1 b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1 deleted file mode 100644 index e1c0999f..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -43ebede449c3782df517a7156c18c28cde4fd4f4 \ No newline at end of file diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1.meta b/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1.meta deleted file mode 100644 index 63dc4be7..00000000 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.sha1.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 16b8065a143bb4277af08381a56157dd -labels: -- gvh -- gvh_version-1.0.4 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GoogleSignIn/Future.cs.meta b/Assets/GoogleSignIn/Future.cs.meta index 75a7f224..3932f1d0 100644 --- a/Assets/GoogleSignIn/Future.cs.meta +++ b/Assets/GoogleSignIn/Future.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: ad3b09fb652fb4ff0a68d1966f13160e labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1495747145 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/GoogleSignIn.cs.meta b/Assets/GoogleSignIn/GoogleSignIn.cs.meta index 31609ffd..e289fb9f 100644 --- a/Assets/GoogleSignIn/GoogleSignIn.cs.meta +++ b/Assets/GoogleSignIn/GoogleSignIn.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: 138b984208e394be797ce8905a44fd54 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1490814915 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta b/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta index 943644cc..0a5774a6 100644 --- a/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta +++ b/Assets/GoogleSignIn/GoogleSignInConfiguration.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: 0c3999c0f68f04ae08f04fb3bf2a2050 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1495747213 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta b/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta index 238e45f5..9a8718dd 100644 --- a/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta +++ b/Assets/GoogleSignIn/GoogleSignInStatusCode.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: 077933fcaedac412d9762bf3e0a3be68 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1501271136 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/GoogleSignInUser.cs.meta b/Assets/GoogleSignIn/GoogleSignInUser.cs.meta index 587c6861..757b4d0d 100644 --- a/Assets/GoogleSignIn/GoogleSignInUser.cs.meta +++ b/Assets/GoogleSignIn/GoogleSignInUser.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: c56b92217d0144af5907627d1235e0a5 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1495747250 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/Impl/BaseObject.cs.meta b/Assets/GoogleSignIn/Impl/BaseObject.cs.meta index 0e24225d..286f1c84 100644 --- a/Assets/GoogleSignIn/Impl/BaseObject.cs.meta +++ b/Assets/GoogleSignIn/Impl/BaseObject.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: fe250cda690a44cb08f8f7d26c9723b4 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1495748295 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs.meta b/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs.meta index 46c1d561..d4e90199 100644 --- a/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs.meta +++ b/Assets/GoogleSignIn/Impl/GoogleSignInImpl.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: 9ae1f008f9f994b9c96c1a14067d7b48 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1502758941 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/Impl/NativeFuture.cs.meta b/Assets/GoogleSignIn/Impl/NativeFuture.cs.meta index 0cb0bd1b..2c44becc 100644 --- a/Assets/GoogleSignIn/Impl/NativeFuture.cs.meta +++ b/Assets/GoogleSignIn/Impl/NativeFuture.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: 5f1aae79b1ca4432d9d8ec382c54bf46 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1502759707 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/GoogleSignIn/Impl/SignInHelperObject.cs.meta b/Assets/GoogleSignIn/Impl/SignInHelperObject.cs.meta index 2dd5652c..8f90a6b2 100644 --- a/Assets/GoogleSignIn/Impl/SignInHelperObject.cs.meta +++ b/Assets/GoogleSignIn/Impl/SignInHelperObject.cs.meta @@ -2,9 +2,9 @@ fileFormatVersion: 2 guid: ad98e5b48888e44eb81dd5884d3a1754 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1500486239 +licenseType: Pro MonoImporter: - externalObjects: {} serializedVersion: 2 defaultReferences: [] executionOrder: 0 diff --git a/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta b/Assets/OneSignal.meta similarity index 67% rename from Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta rename to Assets/OneSignal.meta index 55927234..99b12ff7 100644 --- a/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta +++ b/Assets/OneSignal.meta @@ -1,5 +1,6 @@ fileFormatVersion: 2 -guid: ed9b95dc6ed6d0647ad7f1a8f305385d +guid: b89b30ed1d3a642f78f85c1740272368 +folderAsset: yes DefaultImporter: externalObjects: {} userData: diff --git a/Assets/OneSignal/link.xml b/Assets/OneSignal/link.xml new file mode 100644 index 00000000..68831e9e --- /dev/null +++ b/Assets/OneSignal/link.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.meta b/Assets/OneSignal/link.xml.meta similarity index 61% rename from Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.meta rename to Assets/OneSignal/link.xml.meta index 1236df6d..4f776832 100644 --- a/Assets/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/maven-metadata.xml.meta +++ b/Assets/OneSignal/link.xml.meta @@ -1,8 +1,5 @@ fileFormatVersion: 2 -guid: f3911d467587242978192a8723c68395 -labels: -- gvh -- gvh_version-1.0.4 +guid: a0d82b509bc0d45148624fd1203d3d65 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/PipeOut/Scenes/Loading.unity b/Assets/PipeOut/Scenes/Loading.unity index f7bf5c69..93e7c727 100644 --- a/Assets/PipeOut/Scenes/Loading.unity +++ b/Assets/PipeOut/Scenes/Loading.unity @@ -169,7 +169,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!21 &70808961 +--- !u!21 &79986214 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -204,7 +204,7 @@ Material: m_Floats: - _Alpha: 0 - _ColorMask: 15 - - _Distortion: 1.1646811 + - _Distortion: 0.6972395 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -995,7 +995,7 @@ Transform: m_GameObject: {fileID: 509783898} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 324.34393, y: 886.0344, z: 473073.66} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -2800,7 +2800,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 70808961} + m_Material: {fileID: 79986214} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Plugins/iOS/GoogleSignIn/.DS_Store b/Assets/Plugins/iOS/GoogleSignIn/.DS_Store new file mode 100644 index 00000000..5008ddfc Binary files /dev/null and b/Assets/Plugins/iOS/GoogleSignIn/.DS_Store differ diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h deleted file mode 100644 index 5e77bc10..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Copyright 2017 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -#import -@interface GoogleSignInHandler - : NSObject - -@end diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h.meta b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h.meta deleted file mode 100644 index e115ee31..00000000 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.h.meta +++ /dev/null @@ -1,35 +0,0 @@ -fileFormatVersion: 2 -guid: 62c129704e1ec48179ba285e1af154b8 -labels: -- gvh -- gvh_version-1.0.4 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm index 9b82a370..e82393a1 100644 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm +++ b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm @@ -14,10 +14,11 @@ * limitations under the License. */ #import "GoogleSignIn.h" -#import #import #import #import +#import +#import #import @@ -35,6 +36,9 @@ static const int kStatusCodeInternalError = 7; static const int kStatusCodeNetworkError = 8; static const int kStatusCodeError = 9; +static NSString *cachedLoginHint = nil; +static NSArray *cachedAdditionalScopes = nil; + /** * Helper method to pause the Unity player. This is done when showing any UI. */ @@ -51,96 +55,14 @@ void UnpauseUnityPlayer() { struct SignInResult { int result_code; bool finished; + GIDGoogleUser *user; + NSString *serverAuthCode; }; std::unique_ptr currentResult_; NSRecursiveLock *resultLock = [NSRecursiveLock alloc]; -@implementation GoogleSignInHandler - -/** - * Overload the presenting of the UI so we can pause the Unity player. - */ -- (void)signIn:(GIDSignIn *)signIn - presentViewController:(UIViewController *)viewController { - UnityPause(true); - [UnityGetGLViewController() presentViewController:viewController - animated:YES - completion:nil]; -} - -/** - * Overload the dismissing so we can resume the Unity player. - */ -- (void)signIn:(GIDSignIn *)signIn - dismissViewController:(UIViewController *)viewController { - UnityPause(false); - [UnityGetGLViewController() dismissViewControllerAnimated:YES completion:nil]; -} - -/** - * The sign-in flow has finished and was successful if |error| is |nil|. - * Map the errors from the iOS SDK back to the Android values for consistency's - * sake in the Unity layer. - */ -- (void)signIn:(GIDSignIn *)signIn - didSignInForUser:(GIDGoogleUser *)user - withError:(NSError *)_error { - if (_error == nil) { - if (currentResult_) { - currentResult_->result_code = kStatusCodeSuccess; - currentResult_->finished = true; - } else { - NSLog(@"No currentResult to set status on!"); - } - NSLog(@"didSignInForUser: SUCCESS"); - } else { - NSLog(@"didSignInForUser: %@", _error.localizedDescription); - if (currentResult_) { - switch (_error.code) { - case kGIDSignInErrorCodeUnknown: - currentResult_->result_code = kStatusCodeError; - break; - case kGIDSignInErrorCodeKeychain: - currentResult_->result_code = kStatusCodeInternalError; - break; - case kGIDSignInErrorCodeNoSignInHandlersInstalled: - currentResult_->result_code = kStatusCodeDeveloperError; - break; - case kGIDSignInErrorCodeHasNoAuthInKeychain: - currentResult_->result_code = kStatusCodeError; - break; - case kGIDSignInErrorCodeCanceled: - currentResult_->result_code = kStatusCodeCanceled; - break; - default: - NSLog(@"Unmapped error code: %ld, returning Error", - static_cast(_error.code)); - currentResult_->result_code = kStatusCodeError; - } - - currentResult_->finished = true; - UnpauseUnityPlayer(); - } else { - NSLog(@"No currentResult to set status on!"); - } - } -} - -// Finished disconnecting |user| from the app successfully if |error| is |nil|. -- (void)signIn:(GIDSignIn *)signIn - didDisconnectWithUser:(GIDGoogleUser *)user - withError:(NSError *)_error { - if (_error == nil) { - NSLog(@"didDisconnectWithUser: SUCCESS"); - } else { - NSLog(@"didDisconnectWithUser: %@", _error); - } -} - -@end - /** * These are the external "C" methods that are imported by the Unity C# code. * The parameters are intended to be primative, easy to marshall. @@ -168,12 +90,6 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn, bool requestIdToken, bool hidePopups, const char **additionalScopes, int scopeCount, const char *accountName) { - if (webClientId) { - [GIDSignIn sharedInstance].serverClientID = - [NSString stringWithUTF8String:webClientId]; - } - - [GIDSignIn sharedInstance].shouldFetchBasicProfile = true; int scopeSize = scopeCount; @@ -184,12 +100,11 @@ bool GoogleSignIn_Configure(void *unused, bool useGameSignIn, [tmpary addObject:[NSString stringWithUTF8String:additionalScopes[i]]]; } - [GIDSignIn sharedInstance].scopes = tmpary; + cachedAdditionalScopes = tmpary; } if (accountName) { - [GIDSignIn sharedInstance].loginHint = - [NSString stringWithUTF8String:accountName]; + cachedLoginHint = [NSString stringWithUTF8String:accountName]; } return !useGameSignIn; @@ -205,6 +120,8 @@ static SignInResult *startSignIn() { currentResult_.reset(new SignInResult()); currentResult_->result_code = 0; currentResult_->finished = false; + currentResult_->user = nil; + currentResult_->serverAuthCode = nil; } else { busy = true; } @@ -220,13 +137,60 @@ static SignInResult *startSignIn() { return nullptr; } +/** +* The sign-in flow has finished and was successful if |error| is |nil|. +* Map the errors from the iOS SDK back to the Android values for consistency's +* sake in the Unity layer. +*/ +void HandleSignInError(NSError * _Nullable _error) { + NSLog(@"didSignInForUser: %@", _error.localizedDescription); + if (currentResult_) { + switch (_error.code) { + case kGIDSignInErrorCodeUnknown: + currentResult_->result_code = kStatusCodeError; + break; + case kGIDSignInErrorCodeKeychain: + currentResult_->result_code = kStatusCodeInternalError; + break; + case kGIDSignInErrorCodeHasNoAuthInKeychain: + currentResult_->result_code = kStatusCodeError; + break; + case kGIDSignInErrorCodeCanceled: + currentResult_->result_code = kStatusCodeCanceled; + break; + default: + NSLog(@"Unmapped error code: %ld, returning Error", static_cast(_error.code)); + currentResult_->result_code = kStatusCodeError; + } + + currentResult_->finished = true; + UnpauseUnityPlayer(); + } else { + NSLog(@"No currentResult to set status on!"); + } +} + /** * Sign-In. The return value is a pointer to the currentResult object. */ void *GoogleSignIn_SignIn() { SignInResult *result = startSignIn(); if (!result) { - [[GIDSignIn sharedInstance] signIn]; + [GIDSignIn.sharedInstance signInWithPresentingViewController:UnityGetGLViewController() hint:cachedLoginHint additionalScopes:cachedAdditionalScopes completion:^(GIDSignInResult * _Nullable _result, NSError * _Nullable _error) { + if (_error == nil) { + if (currentResult_) { + currentResult_->result_code = kStatusCodeSuccess; + currentResult_->finished = true; + currentResult_->user = _result.user; + currentResult_->serverAuthCode = _result.serverAuthCode; + } else { + NSLog(@"No currentResult to set status on!"); + } + NSLog(@"didSignInForUser: SUCCESS"); + } else { + HandleSignInError(_error); + } + }]; result = currentResult_.get(); } return result; @@ -239,20 +203,40 @@ void *GoogleSignIn_SignIn() { void *GoogleSignIn_SignInSilently() { SignInResult *result = startSignIn(); if (!result) { - [[GIDSignIn sharedInstance] signInSilently]; + [GIDSignIn.sharedInstance restorePreviousSignInWithCompletion:^(GIDGoogleUser * _Nullable _user, NSError * _Nullable _error) { + if (_error == nil) { + if (currentResult_) { + currentResult_->result_code = kStatusCodeSuccess; + currentResult_->finished = true; + currentResult_->user = _user; + } else { + NSLog(@"No currentResult to set status on!"); + } + NSLog(@"didSignInForUser: SUCCESS"); + } else { + HandleSignInError(_error); + } + }]; result = currentResult_.get(); } return result; } void GoogleSignIn_Signout() { - GIDSignIn *signIn = [GIDSignIn sharedInstance]; + GIDSignIn *signIn = GIDSignIn.sharedInstance; [signIn signOut]; } void GoogleSignIn_Disconnect() { - GIDSignIn *signIn = [GIDSignIn sharedInstance]; - [signIn disconnect]; + GIDSignIn *signIn = GIDSignIn.sharedInstance; + // Finished disconnecting |user| from the app successfully if |error| is |nil|. + [signIn disconnectWithCompletion:^(NSError *_Nullable _error) { + if (_error == nil) { + NSLog(@"didDisconnectWithUser: SUCCESS"); + } else { + NSLog(@"didDisconnectWithUser: %@", _error); + } + }]; } bool GoogleSignIn_Pending(SignInResult *result) { @@ -263,10 +247,9 @@ bool GoogleSignIn_Pending(SignInResult *result) { return ret; } -GIDGoogleUser *GoogleSignIn_Result(SignInResult *result) { +SignInResult *GoogleSignIn_Result(SignInResult *result) { if (result && result->finished) { - GIDGoogleUser *guser = [GIDSignIn sharedInstance].currentUser; - return guser; + return result; } return nullptr; } @@ -300,46 +283,46 @@ static size_t CopyNSString(NSString *src, char *dest, size_t len) { return src ? src.length + 1 : 0; } -size_t GoogleSignIn_GetServerAuthCode(GIDGoogleUser *guser, char *buf, +size_t GoogleSignIn_GetServerAuthCode(SignInResult *gresult, char *buf, size_t len) { - NSString *val = [guser serverAuthCode]; + NSString *val = gresult->serverAuthCode; return CopyNSString(val, buf, len); } -size_t GoogleSignIn_GetDisplayName(GIDGoogleUser *guser, char *buf, +size_t GoogleSignIn_GetDisplayName(SignInResult *gresult, char *buf, size_t len) { - NSString *val = [guser.profile name]; + NSString *val = [gresult->user.profile name]; return CopyNSString(val, buf, len); } -size_t GoogleSignIn_GetEmail(GIDGoogleUser *guser, char *buf, size_t len) { - NSString *val = [guser.profile email]; +size_t GoogleSignIn_GetEmail(SignInResult *gresult, char *buf, size_t len) { + NSString *val = [gresult->user.profile email]; return CopyNSString(val, buf, len); } -size_t GoogleSignIn_GetFamilyName(GIDGoogleUser *guser, char *buf, size_t len) { - NSString *val = [guser.profile familyName]; +size_t GoogleSignIn_GetFamilyName(SignInResult *gresult, char *buf, size_t len) { + NSString *val = [gresult->user.profile familyName]; return CopyNSString(val, buf, len); } -size_t GoogleSignIn_GetGivenName(GIDGoogleUser *guser, char *buf, size_t len) { - NSString *val = [guser.profile givenName]; +size_t GoogleSignIn_GetGivenName(SignInResult *gresult, char *buf, size_t len) { + NSString *val = [gresult->user.profile givenName]; return CopyNSString(val, buf, len); } -size_t GoogleSignIn_GetIdToken(GIDGoogleUser *guser, char *buf, size_t len) { - NSString *val = [guser.authentication idToken]; +size_t GoogleSignIn_GetIdToken(SignInResult *gresult, char *buf, size_t len) { + NSString *val = [gresult->user.idToken tokenString]; return CopyNSString(val, buf, len); } -size_t GoogleSignIn_GetImageUrl(GIDGoogleUser *guser, char *buf, size_t len) { - NSURL *url = [guser.profile imageURLWithDimension:128]; +size_t GoogleSignIn_GetImageUrl(SignInResult *gresult, char *buf, size_t len) { + NSURL *url = [gresult->user.profile imageURLWithDimension:128]; NSString *val = url ? [url absoluteString] : nullptr; return CopyNSString(val, buf, len); } -size_t GoogleSignIn_GetUserId(GIDGoogleUser *guser, char *buf, size_t len) { - NSString *val = [guser userID]; +size_t GoogleSignIn_GetUserId(SignInResult *gresult, char *buf, size_t len) { + NSString *val = [gresult->user userID]; return CopyNSString(val, buf, len); } } // extern "C" diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm.meta b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm.meta index 98623911..d33a9650 100644 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm.meta +++ b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignIn.mm.meta @@ -2,34 +2,34 @@ fileFormatVersion: 2 guid: 521784ee6b2184e0e947a8fd1508afbc labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1510357716 +licenseType: Pro PluginImporter: - externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - iPhone: iOS - second: - enabled: 1 - settings: {} + data: + first: + Any: + second: + enabled: 0 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + DefaultValueInitialized: true + data: + first: + iPhone: iOS + second: + enabled: 1 + settings: {} userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h.meta b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h.meta index 1005ed81..fc4d5558 100644 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h.meta +++ b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.h.meta @@ -2,32 +2,23 @@ fileFormatVersion: 2 guid: ce40e3e7b37a54617a4683dfc0479c71 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1490998272 +licenseType: Pro PluginImporter: - externalObjects: {} - serializedVersion: 2 + serializedVersion: 1 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 0 settings: DefaultValueInitialized: true - - first: - iPhone: iOS - second: + iOS: enabled: 1 settings: {} userData: diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm index 33631489..cd56042f 100644 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm +++ b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm @@ -15,11 +15,10 @@ */ #import "GoogleSignInAppController.h" +#import +#import #import -// Handles Google SignIn UI and events. -GoogleSignInHandler *gsiHandler; - /* * Create a category to customize the application. When this is loaded the * method for the existing application and GoogleSignIn are swizzled into the @@ -69,14 +68,11 @@ GoogleSignInHandler *gsiHandler; ofType:@"plist"]; NSDictionary *dict = [NSDictionary dictionaryWithContentsOfFile:path]; NSString *clientId = [dict objectForKey:@"CLIENT_ID"]; - - gsiHandler = [GoogleSignInHandler alloc]; + NSString *serverClientID = [dict objectForKey:@"SERVER_CLIENT_ID"]; // Setup the Sign-In instance. - GIDSignIn *signIn = [GIDSignIn sharedInstance]; - signIn.clientID = clientId; - signIn.uiDelegate = gsiHandler; - signIn.delegate = gsiHandler; + GIDConfiguration *config = [[GIDConfiguration alloc] initWithClientID:clientId serverClientID:serverClientID]; + [GIDSignIn.sharedInstance setConfiguration:config]; // looks like it's just calling itself, but the implementations were swapped // so we're actually calling the original once we're done @@ -96,9 +92,7 @@ GoogleSignInHandler *gsiHandler; sourceApplication:sourceApplication annotation:annotation]; - return [[GIDSignIn sharedInstance] handleURL:url - sourceApplication:sourceApplication - annotation:annotation] || + return [GIDSignIn.sharedInstance handleURL:url] || handled; } @@ -112,12 +106,7 @@ GoogleSignInHandler *gsiHandler; BOOL handled = [self GoogleSignInAppController:app openURL:url options:options]; - return [[GIDSignIn sharedInstance] - handleURL:url - sourceApplication: - options[UIApplicationOpenURLOptionsSourceApplicationKey] - annotation: - options[UIApplicationOpenURLOptionsAnnotationKey]] || + return [GIDSignIn.sharedInstance handleURL:url] || handled; } diff --git a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm.meta b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm.meta index 676c7108..8e0a46a3 100644 --- a/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm.meta +++ b/Assets/Plugins/iOS/GoogleSignIn/GoogleSignInAppController.mm.meta @@ -2,32 +2,23 @@ fileFormatVersion: 2 guid: 50b2e1c9319e4446e9dbd9b183790472 labels: - gvh -- gvh_version-1.0.4 +timeCreated: 1490998272 +licenseType: Pro PluginImporter: - externalObjects: {} - serializedVersion: 2 + serializedVersion: 1 iconMap: {} executionOrder: {} - defineConstraints: [] isPreloaded: 0 isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 platformData: - - first: - Any: - second: + Any: enabled: 0 settings: {} - - first: - Editor: Editor - second: + Editor: enabled: 0 settings: DefaultValueInitialized: true - - first: - iPhone: iOS - second: + iOS: enabled: 1 settings: {} userData: diff --git a/Assets/Scripts/GoogleSignInIOSBuildPatch.cs b/Assets/Scripts/GoogleSignInIOSBuildPatch.cs index de19d515..c8ec0508 100644 --- a/Assets/Scripts/GoogleSignInIOSBuildPatch.cs +++ b/Assets/Scripts/GoogleSignInIOSBuildPatch.cs @@ -20,6 +20,7 @@ public class GoogleSignInIOSBuildPatch plist.ReadFromFile(plistPath); PlistElementDict rootDict = plist.root; + // Optional: can be removed if not used by your native code rootDict.SetString("GIDClientID", GameConstants.iOS_ClientID); PlistElementArray urlTypes = rootDict.CreateArray("CFBundleURLTypes"); @@ -28,49 +29,9 @@ public class GoogleSignInIOSBuildPatch schemes.AddString(GameConstants.iOS_URL_Scheme); plist.WriteToFile(plistPath); - Debug.Log("✅ Patched Info.plist with GIDClientID and URL scheme."); + Debug.Log("✅ Patched Info.plist with URL scheme."); - // === Modify UnityAppController.mm === - string appControllerPath = Path.Combine(pathToBuiltProject, "Classes", "UnityAppController.mm"); - - if (!File.Exists(appControllerPath)) - { - Debug.LogWarning("⚠️ UnityAppController.mm not found."); - return; - } - - string content = File.ReadAllText(appControllerPath); - - // 1. Inject #import if missing - string importLine = "#import "; - if (!content.Contains(importLine)) - { - int importInsertIndex = content.IndexOf("#import"); - if (importInsertIndex >= 0) - { - int endOfLine = content.IndexOf("\n", importInsertIndex); - content = content.Insert(endOfLine + 1, importLine + "\n"); - } - } - - // 2. Inject GIDSignIn client ID line - string injection = $"[GIDSignIn sharedInstance].clientID = @\"{GameConstants.iOS_ClientID}\";"; - if (!content.Contains(injection)) - { - string marker = "didFinishLaunchingWithOptions:(NSDictionary*)launchOptions"; - int markerIndex = content.IndexOf(marker); - if (markerIndex >= 0) - { - int braceIndex = content.IndexOf("{", markerIndex); - if (braceIndex >= 0) - { - content = content.Insert(braceIndex + 1, "\n " + injection); - } - } - } - - File.WriteAllText(appControllerPath, content); - Debug.Log("✅ Patched UnityAppController.mm with GIDSignIn setup."); + // DO NOT PATCH UnityAppController.mm — GIDSignIn.clientID is removed in SDK v6+ } } -#endif +#endif \ No newline at end of file