From a79cb35838072c1552028a11fc1ed3d7179b1720 Mon Sep 17 00:00:00 2001
From: Ondrej Rehacek <Ondrejrehacek@gmail.com>
Date: Tue, 26 Mar 2024 14:05:13 +0100
Subject: [PATCH] Fixed deep linking on Android sample, updated
 com.unity.purchasing

---
 Assets/Plugins/Android/AndroidManifest.xml    |  22 ++++++++++++++++++
 .../Plugins/Android/AndroidManifest.xml.meta  |   7 ++++++
 ...roid.gms.play-services-games-v2-17.0.0.aar | Bin 349109 -> 349109 bytes
 Assets/Samples/Scenes/StashSample.unity       |   8 +++----
 Packages/manifest.json                        |   2 +-
 Packages/packages-lock.json                   |   5 ++--
 ProjectSettings/GvhProjectSettings.xml        |   2 ++
 ProjectSettings/ProjectSettings.asset         |   6 ++---
 8 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 Assets/Plugins/Android/AndroidManifest.xml
 create mode 100644 Assets/Plugins/Android/AndroidManifest.xml.meta

diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
new file mode 100644
index 0000000..005b5b7
--- /dev/null
+++ b/Assets/Plugins/Android/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools">
+    <application>
+        <activity android:name="com.unity3d.player.UnityPlayerActivity"
+                  android:theme="@style/UnityThemeSelector">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="stashiosdemo" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/Assets/Plugins/Android/AndroidManifest.xml.meta b/Assets/Plugins/Android/AndroidManifest.xml.meta
new file mode 100644
index 0000000..b9f0f59
--- /dev/null
+++ b/Assets/Plugins/Android/AndroidManifest.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 112c6eae8462e4dc58c62c8d6d6beeb5
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-games-v2-17.0.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-games-v2-17.0.0.aar
index 4875cfae376229438826a62f6a69b95f5192089c..91c96036a39c96330e8f91f485222c2bbf7b84e9 100644
GIT binary patch
delta 77
zcmdnGTy*PlQJw&AW)?061`Y-WwdjdFDokq88;v?<0IB9ZGurpeU<6_&AZFgaX9f%N
YPN4YogMq9jAo_bC>j4nGGl=yM0K9t|*#H0l

delta 77
zcmdnGTy*PlQJw&AW)?061`Y-WF6N0mDok9=8;v?<0IB9ZGurpeU<6_&AZFgaX9f%N
YPN4YogMq9jAo_bC>j4nGGl=yM0AVv2ApigX

diff --git a/Assets/Samples/Scenes/StashSample.unity b/Assets/Samples/Scenes/StashSample.unity
index c227b4d..5fb16bb 100644
--- a/Assets/Samples/Scenes/StashSample.unity
+++ b/Assets/Samples/Scenes/StashSample.unity
@@ -522,10 +522,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 868708303}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 392.25, y: -15.645}
-  m_SizeDelta: {x: 784.5, y: 31.29}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &375644528
 MonoBehaviour:
diff --git a/Packages/manifest.json b/Packages/manifest.json
index f3ff4df..0ae0149 100644
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -13,7 +13,7 @@
     "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.mobile.android-logcat": "1.4.0",
-    "com.unity.purchasing": "4.9.3",
+    "com.unity.purchasing": "4.11.0",
     "com.unity.services.authentication": "3.3.0",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",
diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
index 7e41e07..015b620 100644
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -139,16 +139,15 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.purchasing": {
-      "version": "4.9.3",
+      "version": "4.11.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.ugui": "1.0.0",
-        "com.unity.modules.unityanalytics": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0",
         "com.unity.modules.androidjni": "1.0.0",
-        "com.unity.services.core": "1.8.1"
+        "com.unity.services.core": "1.8.2"
       },
       "url": "https://packages.unity.com"
     },
diff --git a/ProjectSettings/GvhProjectSettings.xml b/ProjectSettings/GvhProjectSettings.xml
index 47fce63..42602f6 100644
--- a/ProjectSettings/GvhProjectSettings.xml
+++ b/ProjectSettings/GvhProjectSettings.xml
@@ -3,4 +3,6 @@
   <projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
   <projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
+  <projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
+  <projectSetting name="GooglePlayServices.UseJetifier" value="True" />
 </projectSettings>
\ No newline at end of file
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 0eb3109..8f19b12 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -166,9 +166,9 @@ PlayerSettings:
     iPhone: 1
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 1
+  AndroidBundleVersionCode: 3
   AndroidMinSdkVersion: 22
-  AndroidTargetSdkVersion: 0
+  AndroidTargetSdkVersion: 34
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   stripEngineCode: 1
@@ -251,7 +251,7 @@ PlayerSettings:
   clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
   templatePackageId: com.unity.template.3d@8.1.1
   templateDefaultScene: Assets/Scenes/SampleScene.unity
-  useCustomMainManifest: 0
+  useCustomMainManifest: 1
   useCustomLauncherManifest: 0
   useCustomMainGradleTemplate: 0
   useCustomLauncherGradleManifest: 0