fix AndroidBuild

popcorn/Assets/GameAnalytics/Plugins/Android/instantapps-1.1.0.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 2399d067eb0414c1788edd794d77e8c1
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

popcorn/Assets/GameAnalytics/Plugins/Android/play-services-appset-16.0.2.aar.meta

@@ -1,32 +0,0 @@
-fileFormatVersion: 2
-guid: 265f68ba80fb7490cb68cadbea3c3cdd
-PluginImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  iconMap: {}
-  executionOrder: {}
-  defineConstraints: []
-  isPreloaded: 0
-  isOverridable: 0
-  isExplicitlyReferenced: 0
-  validateReferences: 1
-  platformData:
-  - first:
-      Android: Android
-    second:
-      enabled: 1
-      settings: {}
-  - first:
-      Any: 
-    second:
-      enabled: 0
-      settings: {}
-  - first:
-      Editor: Editor
-    second:
-      enabled: 0
-      settings:
-        DefaultValueInitialized: true
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6c8f051f9e89e45a0964ad86e97b934b
+guid: d5d96b79960ff4d0ea69ce3ff26cd5cd
 labels:
 - gpsr
 PluginImporter:

popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bee355e2a473d4ca0bbf3e5a10f9afce
+guid: a8a813a31505645f385d3f2db99502c0
 labels:
 - gpsr
 PluginImporter:

popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6abc177a889a74174b7931368d82bacd
+guid: d85aab97e3c424118b19953d760d7bd8
 labels:
 - gpsr
 PluginImporter:

popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 588774069102e4a4fb9868caa5629ae5
+guid: 8c20edbef7d3d489ba887ad9dd266f4f
 labels:
 - gpsr
 PluginImporter:

popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar.meta

@@ -0,0 +1,34 @@
+fileFormatVersion: 2
+guid: 7edff46a4cfba483f9eeb4a98c3a9b00
+labels:
+- gpsr
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

popcorn/ProjectSettings/AndroidResolverDependencies.xml

@@ -2,7 +2,9 @@
   <packages>
     <package>com.google.android.gms:play-services-ads-identifier:17.0.0</package>
     <package>com.google.android.gms:play-services-appset:16.0.0</package>
+    <package>com.google.android.gms:play-services-appset:16.0.2</package>
     <package>com.google.android.gms:play-services-basement:17.2.1</package>
+    <package>com.google.android.instantapps:instantapps:1.1.0</package>
     <package>com.ironsource.sdk:mediationsdk:7.1.12</package>
   </packages>
   <files>
@@ -34,10 +36,11 @@
     <file>Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar</file>
     <file>Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar</file>
     <file>Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-17.0.0.aar</file>
-    <file>Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar</file>
-    <file>Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar</file>
-    <file>Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar</file>
-    <file>Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar</file>
+    <file>Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar</file>
     <file>Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar</file>
     <file>Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar</file>
     <file>Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.4.32.jar</file>

popcorn/ProjectSettings/GraphicsSettings.asset

@@ -34,6 +34,7 @@ GraphicsSettings:
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}

popcorn/ProjectSettings/ProjectSettings.asset

@@ -175,7 +175,7 @@ PlayerSettings:
     iPhone: jp.usaya.popcorn
   buildNumber:
     iPhone: 2
-  AndroidBundleVersionCode: 2
+  AndroidBundleVersionCode: 3
   AndroidMinSdkVersion: 21
   AndroidTargetSdkVersion: 0
   AndroidPreferredInstallLocation: 1