diff --git a/Assets/GoogleMobileAds/Editor/MetaAudienceNetworkMediationDependencies.xml b/Assets/GoogleMobileAds/Editor/MetaAudienceNetworkMediationDependencies.xml
new file mode 100644
index 00000000..0cbc35bb
--- /dev/null
+++ b/Assets/GoogleMobileAds/Editor/MetaAudienceNetworkMediationDependencies.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ https://repo.maven.apache.org/maven2/
+ https://dl.google.com/dl/android/maven2/
+
+
+
+
+
+
+
+ https://github.com/CocoaPods/Specs
+
+
+
+
diff --git a/Assets/GoogleMobileAds/Editor/MetaAudienceNetworkMediationDependencies.xml.meta b/Assets/GoogleMobileAds/Editor/MetaAudienceNetworkMediationDependencies.xml.meta
new file mode 100644
index 00000000..4fca7924
--- /dev/null
+++ b/Assets/GoogleMobileAds/Editor/MetaAudienceNetworkMediationDependencies.xml.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1ebed9058ed5d4b15a0154e463e10b02
+TextScriptImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar b/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar
deleted file mode 100644
index 7c49e1c1..00000000
Binary files a/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar and /dev/null differ
diff --git a/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar b/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar
new file mode 100644
index 00000000..8924208d
Binary files /dev/null and b/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar.meta b/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar.meta
similarity index 93%
rename from Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar.meta
rename to Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar.meta
index 5377933f..3ecee25d 100644
--- a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar.meta
+++ b/Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 55b959a13292445a59bd378fb17ca056
+guid: 1bf7719d1839eb544b12031bde955986
labels:
- gpsr
PluginImporter:
diff --git a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.4.1.aar b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.4.1.aar
index dfe5ac88..7c178aec 100644
Binary files a/Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.4.1.aar and b/Assets/Plugins/Android/androidx.lifecycle.lifecycle-process-2.4.1.aar differ
diff --git a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.1.1.aar b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.1.1.aar
index fbea5f85..a1154f09 100644
Binary files a/Assets/Plugins/Android/androidx.startup.startup-runtime-1.1.1.aar and b/Assets/Plugins/Android/androidx.startup.startup-runtime-1.1.1.aar differ
diff --git a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar
index d9386a24..378ea227 100644
Binary files a/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar and b/Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar differ
diff --git a/Assets/Plugins/Android/com.facebook.android.audience-network-sdk-6.12.0.aar b/Assets/Plugins/Android/com.facebook.android.audience-network-sdk-6.12.0.aar
new file mode 100644
index 00000000..3a5536c0
Binary files /dev/null and b/Assets/Plugins/Android/com.facebook.android.audience-network-sdk-6.12.0.aar differ
diff --git a/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta b/Assets/Plugins/Android/com.facebook.android.audience-network-sdk-6.12.0.aar.meta
similarity index 93%
rename from Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta
rename to Assets/Plugins/Android/com.facebook.android.audience-network-sdk-6.12.0.aar.meta
index 306f7f65..92aebbfa 100644
--- a/Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar.meta
+++ b/Assets/Plugins/Android/com.facebook.android.audience-network-sdk-6.12.0.aar.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 0fbd6cdee7ef7428fbe7845015cc6f03
+guid: b2305e42760edd54eba8c7ca87565515
labels:
- gpsr
PluginImporter:
diff --git a/Assets/Plugins/Android/com.google.ads.mediation.facebook-6.12.0.0.aar b/Assets/Plugins/Android/com.google.ads.mediation.facebook-6.12.0.0.aar
new file mode 100644
index 00000000..67eb7e89
Binary files /dev/null and b/Assets/Plugins/Android/com.google.ads.mediation.facebook-6.12.0.0.aar differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar.meta b/Assets/Plugins/Android/com.google.ads.mediation.facebook-6.12.0.0.aar.meta
similarity index 93%
rename from Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar.meta
rename to Assets/Plugins/Android/com.google.ads.mediation.facebook-6.12.0.0.aar.meta
index b30a68b4..6dcdf0a6 100644
--- a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar.meta
+++ b/Assets/Plugins/Android/com.google.ads.mediation.facebook-6.12.0.0.aar.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: fc2a016debfca48f28c847c93f5dafda
+guid: c0a8eb3084ebf124b90fc387ef16e2ea
labels:
- gpsr
PluginImporter:
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar
deleted file mode 100644
index 13ca652f..00000000
Binary files a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar and /dev/null differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.5.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.5.0.aar
new file mode 100644
index 00000000..7addb22a
Binary files /dev/null and b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.5.0.aar differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.5.0.aar.meta
similarity index 93%
rename from Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar.meta
rename to Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.5.0.aar.meta
index c3a9d38b..6b1be358 100644
--- a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar.meta
+++ b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.5.0.aar.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 25b0f4e355a6f4ee7a094c0c9c51c213
+guid: c813bac8a8dc34db6bc70aa2247578f6
labels:
- gpsr
PluginImporter:
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar
deleted file mode 100644
index 9fe18af9..00000000
Binary files a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar and /dev/null differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.5.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.5.0.aar
new file mode 100644
index 00000000..54098476
Binary files /dev/null and b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.5.0.aar differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.5.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.5.0.aar.meta
new file mode 100644
index 00000000..f7becaee
--- /dev/null
+++ b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.5.0.aar.meta
@@ -0,0 +1,34 @@
+fileFormatVersion: 2
+guid: dacd4c8173c854313893169db9b2cb63
+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/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar
deleted file mode 100644
index 31b33b48..00000000
Binary files a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar and /dev/null differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.5.0.aar b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.5.0.aar
new file mode 100644
index 00000000..9d88287a
Binary files /dev/null and b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.5.0.aar differ
diff --git a/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.5.0.aar.meta b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.5.0.aar.meta
new file mode 100644
index 00000000..38360cc4
--- /dev/null
+++ b/Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.5.0.aar.meta
@@ -0,0 +1,34 @@
+fileFormatVersion: 2
+guid: 77d9386c76b9c49aea5fa8b0237b7bdd
+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/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 92987675..4d4c23b9 100644
Binary files a/Assets/Plugins/Android/com.google.android.gms.play-services-games-v2-17.0.0.aar and b/Assets/Plugins/Android/com.google.android.gms.play-services-games-v2-17.0.0.aar differ
diff --git a/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar b/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar
new file mode 100644
index 00000000..fb794be9
Binary files /dev/null and b/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar differ
diff --git a/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar.meta b/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar.meta
new file mode 100644
index 00000000..dd8b4a8b
--- /dev/null
+++ b/Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar.meta
@@ -0,0 +1,34 @@
+fileFormatVersion: 2
+guid: 74e5549b5482c014ab3bb6041c749522
+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/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar
new file mode 100644
index 00000000..1cd9e7c7
Binary files /dev/null and b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar differ
diff --git a/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar.meta b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar.meta
new file mode 100644
index 00000000..9f948c3d
--- /dev/null
+++ b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar.meta
@@ -0,0 +1,34 @@
+fileFormatVersion: 2
+guid: a92dd279a304f73418f8f42b8e9c10eb
+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/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar
new file mode 100644
index 00000000..3c2b91d8
Binary files /dev/null and b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar differ
diff --git a/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar.meta b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar.meta
new file mode 100644
index 00000000..b2554563
--- /dev/null
+++ b/Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar.meta
@@ -0,0 +1,34 @@
+fileFormatVersion: 2
+guid: 53eed9ffbd325e2498f00b68b79f2753
+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/ProjectSettings/AndroidResolverDependencies.xml b/ProjectSettings/AndroidResolverDependencies.xml
index 92c237aa..7f19bf0d 100644
--- a/ProjectSettings/AndroidResolverDependencies.xml
+++ b/ProjectSettings/AndroidResolverDependencies.xml
@@ -2,12 +2,13 @@
androidx.lifecycle:lifecycle-common-java8:2.4.1
androidx.lifecycle:lifecycle-process:2.4.1
+ com.google.ads.mediation:facebook:6.12.0.0
com.google.android.gms:play-services-ads:21.3.0
com.google.android.ump:user-messaging-platform:2.0.0
com.google.games:gpgs-plugin-support:0.11.01
- Assets/Plugins/Android/androidx.annotation.annotation-1.2.0.jar
+ Assets/Plugins/Android/androidx.annotation.annotation-1.5.0.jar
Assets/Plugins/Android/androidx.annotation.annotation-experimental-1.1.0.aar
Assets/Plugins/Android/androidx.arch.core.core-common-2.1.0.jar
Assets/Plugins/Android/androidx.arch.core.core-runtime-2.1.0.aar
@@ -47,10 +48,12 @@
Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.1.aar
Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar
Assets/Plugins/Android/androidx.work.work-runtime-2.7.0.aar
- Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.3.0.aar
- Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.3.0.aar
+ Assets/Plugins/Android/com.facebook.android.audience-network-sdk-6.12.0.aar
+ Assets/Plugins/Android/com.google.ads.mediation.facebook-6.12.0.0.aar
+ Assets/Plugins/Android/com.google.android.gms.play-services-ads-21.5.0.aar
+ Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-21.5.0.aar
Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-18.0.0.aar
- Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.3.0.aar
+ Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-21.5.0.aar
Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.1.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
@@ -63,6 +66,9 @@
Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-2.0.0.aar
Assets/Plugins/Android/com.google.games.gpgs-plugin-support-0.11.01.aar
Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar
+ Assets/Plugins/Android/org.jetbrains.annotations-13.0.jar
+ Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-1.7.10.jar
+ Assets/Plugins/Android/org.jetbrains.kotlin.kotlin-stdlib-common-1.7.10.jar