diff --git a/popcorn/Assets/GameAnalytics/Plugins/Android/instantapps-1.1.0.aar b/popcorn/Assets/GameAnalytics/Plugins/Android/instantapps-1.1.0.aar deleted file mode 100644 index 62a4159e..00000000 Binary files a/popcorn/Assets/GameAnalytics/Plugins/Android/instantapps-1.1.0.aar and /dev/null differ diff --git a/popcorn/Assets/GameAnalytics/Plugins/Android/instantapps-1.1.0.aar.meta b/popcorn/Assets/GameAnalytics/Plugins/Android/instantapps-1.1.0.aar.meta deleted file mode 100644 index 94dcf1f7..00000000 --- a/popcorn/Assets/GameAnalytics/Plugins/Android/instantapps-1.1.0.aar.meta +++ /dev/null @@ -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: diff --git a/popcorn/Assets/GameAnalytics/Plugins/Android/play-services-appset-16.0.2.aar.meta b/popcorn/Assets/GameAnalytics/Plugins/Android/play-services-appset-16.0.2.aar.meta deleted file mode 100644 index 7aca4e72..00000000 --- a/popcorn/Assets/GameAnalytics/Plugins/Android/play-services-appset-16.0.2.aar.meta +++ /dev/null @@ -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: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar deleted file mode 100644 index 6244f1df..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/GameAnalytics/Plugins/Android/play-services-appset-16.0.2.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar similarity index 100% rename from popcorn/Assets/GameAnalytics/Plugins/Android/play-services-appset-16.0.2.aar rename to popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta similarity index 93% rename from popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar.meta rename to popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta index 168663cd..e5c49e3c 100644 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar.meta +++ b/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: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar deleted file mode 100644 index 1ce3e0d1..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar new file mode 100644 index 00000000..e20a3b82 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta similarity index 93% rename from popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar.meta rename to popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta index 42ef6f99..b7080f9f 100644 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar.meta +++ b/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: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar deleted file mode 100644 index 74aa5b76..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar new file mode 100644 index 00000000..f5da36f9 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta similarity index 93% rename from popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar.meta rename to popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta index 29388e7f..c7dc395d 100644 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar.meta +++ b/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: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar deleted file mode 100644 index f00c57de..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar new file mode 100644 index 00000000..dca0eb67 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta similarity index 93% rename from popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar.meta rename to popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta index 3b7d66c3..f8d583a3 100644 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar.meta +++ b/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: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar new file mode 100644 index 00000000..1b61bce3 Binary files /dev/null and b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar.meta new file mode 100644 index 00000000..e7089bba --- /dev/null +++ b/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: diff --git a/popcorn/Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar b/popcorn/Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar index 9be2514c..0df640ea 100644 Binary files a/popcorn/Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar and b/popcorn/Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar differ diff --git a/popcorn/ProjectSettings/AndroidResolverDependencies.xml b/popcorn/ProjectSettings/AndroidResolverDependencies.xml index 850588a4..56eeed18 100644 --- a/popcorn/ProjectSettings/AndroidResolverDependencies.xml +++ b/popcorn/ProjectSettings/AndroidResolverDependencies.xml @@ -2,7 +2,9 @@ com.google.android.gms:play-services-ads-identifier:17.0.0 com.google.android.gms:play-services-appset:16.0.0 + com.google.android.gms:play-services-appset:16.0.2 com.google.android.gms:play-services-basement:17.2.1 + com.google.android.instantapps:instantapps:1.1.0 com.ironsource.sdk:mediationsdk:7.1.12 @@ -34,10 +36,11 @@ Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-17.0.0.aar - Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.0.aar - Assets/Plugins/Android/com.google.android.gms.play-services-base-17.6.0.aar - Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar - Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.2.1.aar + Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar + Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar + Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar + Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar + Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar Assets/Plugins/Android/com.ironsource.sdk.mediationsdk-7.1.12.aar Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.4.32.jar diff --git a/popcorn/ProjectSettings/GraphicsSettings.asset b/popcorn/ProjectSettings/GraphicsSettings.asset index 4654e133..71c9e0f5 100644 --- a/popcorn/ProjectSettings/GraphicsSettings.asset +++ b/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} diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 1f33d3bf..576a8a0b 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/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