diff --git a/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar b/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar deleted file mode 100644 index 06695124..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta deleted file mode 100644 index 85d3dde6..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: c28109225a36c4a84b153464a848e31c -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/androidx.arch.core.core-common-2.0.0.jar b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar deleted file mode 100644 index 98ec8865..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta deleted file mode 100644 index d97f22eb..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 016b539d518d343628eb69f10edcbcb3 -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/androidx.arch.core.core-runtime-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar deleted file mode 100644 index f876595c..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta deleted file mode 100644 index b9b7a865..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 02d587c62b9794534a94fa3103b0c89e -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/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar deleted file mode 100644 index 337f4c49..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta deleted file mode 100644 index f0752c91..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: ef19450e3442f4c86a25476c066b0980 -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/androidx.collection.collection-1.0.0.jar b/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar deleted file mode 100644 index 78ac06c4..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta deleted file mode 100644 index 248092f3..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 6aa68cd49934749e0aa0a8903b125310 -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/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar deleted file mode 100644 index de447ec4..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta deleted file mode 100644 index cbc56e2c..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 01ad0d8c9b440481e9eea9def41ad409 -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/androidx.core.core-1.2.0.aar b/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar deleted file mode 100644 index e8be07ba..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta deleted file mode 100644 index 6b280463..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 8223321be393c467297b4adff3c056df -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/androidx.cursoradapter.cursoradapter-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar deleted file mode 100644 index cd1494a9..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta deleted file mode 100644 index 2a6c5539..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 75f8ce9a784394e82b50832da2056fe2 -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/androidx.customview.customview-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar deleted file mode 100644 index 73e70ac4..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta deleted file mode 100644 index 9cfa9904..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 17ea17d707b0c4763915a457746ac607 -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/androidx.documentfile.documentfile-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar deleted file mode 100644 index 79fd5502..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta deleted file mode 100644 index fea38ea2..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 26c6cce7a14414d03b3d2ad70212bd41 -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/androidx.drawerlayout.drawerlayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar deleted file mode 100644 index a9968c7f..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta deleted file mode 100644 index 58f88bd1..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: edc91ca6c5a3640baa84726b1adf5555 -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/androidx.fragment.fragment-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar deleted file mode 100644 index 7a5c3605..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta deleted file mode 100644 index c8d4a24a..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 98f6f7a6b3db942119029f64a0d46a30 -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/androidx.interpolator.interpolator-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar deleted file mode 100644 index bccf86f7..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta deleted file mode 100644 index 209d4409..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 85eda5515f7e64917bebf950126e4929 -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/androidx.legacy.legacy-support-core-ui-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar deleted file mode 100644 index 01275eb2..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta deleted file mode 100644 index c0a27b9c..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 34aca34bed39d483281862852482729c -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/androidx.legacy.legacy-support-core-utils-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar deleted file mode 100644 index 2980f603..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta deleted file mode 100644 index c40da5ad..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 7d59822de94ce4e5aa29934929bf523f -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/androidx.lifecycle.lifecycle-common-2.0.0.jar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar deleted file mode 100644 index 6c3f095c..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta deleted file mode 100644 index 82c5f873..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 8974afee5b66f45be8dc0bcaa707b363 -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/androidx.lifecycle.lifecycle-livedata-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar deleted file mode 100644 index 27b091c1..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta deleted file mode 100644 index dbd3df3a..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: b5fd7dff8c81f4edab790ca5c4aba7a0 -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/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar deleted file mode 100644 index 5583b9f5..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta deleted file mode 100644 index e29c6f63..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 85201507fb9834f29b274cb6b92bf91d -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/androidx.lifecycle.lifecycle-runtime-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar deleted file mode 100644 index 0809d720..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta deleted file mode 100644 index 7a887c81..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 13bbcd939608c4596af737ebe7ef1336 -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/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar deleted file mode 100644 index b142a708..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta deleted file mode 100644 index f9c36a50..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 05f2cba90a7ec46a899698bdef1c6bb8 -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/androidx.loader.loader-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar deleted file mode 100644 index 32c57746..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta deleted file mode 100644 index e0d2d37f..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: ebd8411c649e441e280ca6b6e38f32ea -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/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar deleted file mode 100644 index e9074ee4..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta deleted file mode 100644 index 57f2905a..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: d96290cfc82b344f893f214ccbc4f144 -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/androidx.print.print-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar deleted file mode 100644 index 7bb51fd5..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta deleted file mode 100644 index 80844c22..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 94247b09bd7da4d4695cb6b3f164ec36 -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/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar deleted file mode 100644 index ebee0eee..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta deleted file mode 100644 index 3c73172f..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: fa54354da86b44a7eabe8ee4860dcee5 -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/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar deleted file mode 100644 index 71d4748e..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta deleted file mode 100644 index 99e6fb1c..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: c25a61264e7aa4b359d662914e15df79 -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/androidx.versionedparcelable.versionedparcelable-1.1.0.aar b/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar deleted file mode 100644 index d4792e06..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta deleted file mode 100644 index 84e52c67..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 64b9cd3937ee743d1819bdbc8249c86f -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/androidx.viewpager.viewpager-1.0.0.aar b/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar deleted file mode 100644 index a7667298..00000000 Binary files a/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta b/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta deleted file mode 100644 index 276a6f82..00000000 --- a/popcorn/Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: f4f9c45d8ac6a4f109cdba841f9ea1ec -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/baseProjectTemplate.gradle b/popcorn/Assets/Plugins/Android/baseProjectTemplate.gradle new file mode 100755 index 00000000..304bf510 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/baseProjectTemplate.gradle @@ -0,0 +1,31 @@ +// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN + +allprojects { + buildscript { + repositories {**ARTIFACTORYREPOSITORY** + google() + jcenter() + } + + dependencies { + // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity + // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html + // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle + // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version + classpath 'com.android.tools.build:gradle:4.0.1' + **BUILD_SCRIPT_DEPS** + } + } + + repositories {**ARTIFACTORYREPOSITORY** + google() + jcenter() + flatDir { + dirs "${project(':unityLibrary').projectDir}/libs" + } + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/popcorn/Assets/Plugins/Android/res/values/strings.xml.meta b/popcorn/Assets/Plugins/Android/baseProjectTemplate.gradle.meta similarity index 74% rename from popcorn/Assets/Plugins/Android/res/values/strings.xml.meta rename to popcorn/Assets/Plugins/Android/baseProjectTemplate.gradle.meta index 00fc8787..b58e67dc 100644 --- a/popcorn/Assets/Plugins/Android/res/values/strings.xml.meta +++ b/popcorn/Assets/Plugins/Android/baseProjectTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: bc34b1916674c4c7bbc94e66a22de6b2 +guid: caa90ae8548fc4fe2a464ebe99cb34bc DefaultImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar deleted file mode 100644 index a56e068f..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta deleted file mode 100644 index 27d0458f..00000000 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-appset-16.0.2.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 397f25029afc747f6ae98eaef36269ce -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.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 deleted file mode 100644 index e20a3b82..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta deleted file mode 100644 index 326d3248..00000000 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-base-18.0.1.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 0b5aa8e9234924aae83e7f41de483ea3 -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.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 deleted file mode 100644 index f5da36f9..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta deleted file mode 100644 index 29bd421a..00000000 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-basement-18.0.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: ff2802ddf477745afbbf34c3d7795add -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.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 deleted file mode 100644 index dca0eb67..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar and /dev/null differ diff --git a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta b/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta deleted file mode 100644 index d284f829..00000000 --- a/popcorn/Assets/Plugins/Android/com.google.android.gms.play-services-tasks-18.0.1.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 024d5d6864a6247d689c8f60726bc6ee -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.google.android.instantapps.instantapps-1.1.0.aar b/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar deleted file mode 100644 index 9e6edf18..00000000 Binary files a/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar and /dev/null 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 deleted file mode 100644 index b5864665..00000000 --- a/popcorn/Assets/Plugins/Android/com.google.android.instantapps.instantapps-1.1.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 062d2fe401b3648bb8d82f385cecca38 -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/gradleTemplate.properties b/popcorn/Assets/Plugins/Android/gradleTemplate.properties new file mode 100755 index 00000000..dea15e96 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/gradleTemplate.properties @@ -0,0 +1,10 @@ +org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M +org.gradle.parallel=true +android.enableR8=false +unityStreamingAssets=.unity3d**STREAMING_ASSETS** + +# Android Resolver Properties Start +android.useAndroidX=true +android.enableJetifier=true +# Android Resolver Properties End +**ADDITIONAL_PROPERTIES** diff --git a/popcorn/Assets/Plugins/Android/res/values/version.xml.meta b/popcorn/Assets/Plugins/Android/gradleTemplate.properties.meta similarity index 74% rename from popcorn/Assets/Plugins/Android/res/values/version.xml.meta rename to popcorn/Assets/Plugins/Android/gradleTemplate.properties.meta index acaa2712..09fbb203 100644 --- a/popcorn/Assets/Plugins/Android/res/values/version.xml.meta +++ b/popcorn/Assets/Plugins/Android/gradleTemplate.properties.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21458264303ff461bba4e76afec51005 +guid: 0df3ccd2d4e944d5da290a98b66e3b54 DefaultImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/Plugins/Android/launcherTemplate.gradle b/popcorn/Assets/Plugins/Android/launcherTemplate.gradle new file mode 100755 index 00000000..4a2880f5 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/launcherTemplate.gradle @@ -0,0 +1,84 @@ +// GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN + +apply plugin: 'com.android.application' + +dependencies { + implementation project(':unityLibrary') + } + +android { + + compileSdkVersion 30 + buildToolsVersion '30.0.0' + + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + multiDexEnabled true + minSdkVersion 19 + targetSdkVersion 30 + applicationId '**APPLICATIONID**' + ndk { + abiFilters **ABIFILTERS** + } + versionCode **VERSIONCODE** + versionName '**VERSIONNAME**' + } + + aaptOptions { + noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ') + ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~" + }**SIGN** + + lintOptions { + abortOnError false + } + + buildTypes { + debug { + minifyEnabled **MINIFY_DEBUG** + + proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG** + jniDebuggable true + } + release { + minifyEnabled **MINIFY_RELEASE** + + proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG** + } + }**PACKAGING_OPTIONS****SPLITS** +**BUILT_APK_LOCATION** + bundle { + language { + enableSplit = true + } + density { + enableSplit = true + } + abi { + enableSplit = true + } + } +}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP** + + +tasks.whenTaskAdded { task -> + if (task.name.startsWith("bundle")) { + def renameTaskName = "rename${task.name.capitalize()}Aab" + def flavor = task.name.substring("bundle".length()).uncapitalize() + tasks.create(renameTaskName, Copy) { + def path = "${buildDir}/outputs/bundle/${flavor}/" + from(path) + include "launcher-release.aab" + destinationDir file("${buildDir}/outputs/bundle/${flavor}/") + rename "launcher-release.aab", "launcher.aab" + } + + task.finalizedBy(renameTaskName) + } +} + diff --git a/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta b/popcorn/Assets/Plugins/Android/launcherTemplate.gradle.meta similarity index 74% rename from popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta rename to popcorn/Assets/Plugins/Android/launcherTemplate.gradle.meta index 61bf6f6d..898adeab 100644 --- a/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml.meta +++ b/popcorn/Assets/Plugins/Android/launcherTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3519b5de57ee54eb89e07291cd3abfec +guid: 58dcfb963f8964ecc9d7f59761675ace DefaultImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/Plugins/Android/mainTemplate.gradle b/popcorn/Assets/Plugins/Android/mainTemplate.gradle new file mode 100755 index 00000000..4a57bb54 --- /dev/null +++ b/popcorn/Assets/Plugins/Android/mainTemplate.gradle @@ -0,0 +1,82 @@ + +// Android Resolver Repos Start +([rootProject] + (rootProject.subprojects as List)).each { project -> + project.repositories { + def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") + maven { + url "https://maven.google.com" + } + mavenLocal() + mavenCentral() + } +} +// Android Resolver Repos End +apply plugin: 'com.android.library' + +buildscript { + repositories { + + google() + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:4.0.1' + +**BUILD_SCRIPT_DEPS**} +} + + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.72' +// Android Resolver Dependencies Start + implementation 'com.google.android.gms:play-services-appset:16.0.2' // Assets/GameAnalytics/Editor/Android/Dependencies.xml:4 + implementation 'com.google.android.instantapps:instantapps:1.1.0' // Assets/GameAnalytics/Editor/Android/Dependencies.xml:3 +// Android Resolver Dependencies End +**DEPS**} + +// Android Resolver Exclusions Start +android { + packagingOptions { + exclude ('/lib/armeabi/*' + '*') + exclude ('/lib/mips/*' + '*') + exclude ('/lib/mips64/*' + '*') + exclude ('/lib/x86/*' + '*') + exclude ('/lib/x86_64/*' + '*') + } +} +// Android Resolver Exclusions End +android { + compileSdkVersion 30 + buildToolsVersion '30.0.0' + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + defaultConfig { + multiDexEnabled true + minSdkVersion **MINSDKVERSION** + targetSdkVersion **TARGETSDKVERSION** + ndk { + abiFilters **ABIFILTERS** + } + versionCode **VERSIONCODE** + versionName '**VERSIONNAME**' + consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD** + } + + lintOptions { + abortOnError false + } + + aaptOptions { + noCompress = ['.ress', '.resource', '.obb'] + unityStreamingAssets.tokenize(', ') + ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~" + }**PACKAGING_OPTIONS** +}**REPOSITORIES** +**IL_CPP_BUILD_SETUP** +**SOURCE_BUILD_SETUP** +**EXTERNAL_SOURCES** diff --git a/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta b/popcorn/Assets/Plugins/Android/mainTemplate.gradle.meta similarity index 74% rename from popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta rename to popcorn/Assets/Plugins/Android/mainTemplate.gradle.meta index 3de4f3b4..a2cdd2b3 100644 --- a/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml.meta +++ b/popcorn/Assets/Plugins/Android/mainTemplate.gradle.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b15d476e0648e443fae84941bcda6392 +guid: 2d3cf7c16a24d4deca63d34face5204b DefaultImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/Plugins/Android/res.meta b/popcorn/Assets/Plugins/Android/res.meta deleted file mode 100644 index da50b5e6..00000000 --- a/popcorn/Assets/Plugins/Android/res.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c11128cd2c284d05886f8faf820d18b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/values-ja.meta b/popcorn/Assets/Plugins/Android/res/values-ja.meta deleted file mode 100644 index e92bfc59..00000000 --- a/popcorn/Assets/Plugins/Android/res/values-ja.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 22e675099184d48869f17c4d37de7d7c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml b/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml deleted file mode 100644 index 416bb32a..00000000 --- a/popcorn/Assets/Plugins/Android/res/values-ja/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - ポップコーン - diff --git a/popcorn/Assets/Plugins/Android/res/values.meta b/popcorn/Assets/Plugins/Android/res/values.meta deleted file mode 100644 index 2da8c0bf..00000000 --- a/popcorn/Assets/Plugins/Android/res/values.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a0639bc78e2c742ad90bb7fd9209bffd -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/values/strings.xml b/popcorn/Assets/Plugins/Android/res/values/strings.xml deleted file mode 100644 index cb29e4d4..00000000 --- a/popcorn/Assets/Plugins/Android/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - Popcorn - diff --git a/popcorn/Assets/Plugins/Android/res/values/version.xml b/popcorn/Assets/Plugins/Android/res/values/version.xml deleted file mode 100644 index f9d9be05..00000000 --- a/popcorn/Assets/Plugins/Android/res/values/version.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 12451000 - \ No newline at end of file diff --git a/popcorn/Assets/Plugins/Android/res/xml.meta b/popcorn/Assets/Plugins/Android/res/xml.meta deleted file mode 100644 index d677757e..00000000 --- a/popcorn/Assets/Plugins/Android/res/xml.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e91468763bc7644208d37eee8786052e -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml b/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml deleted file mode 100644 index 7fd8bcf0..00000000 --- a/popcorn/Assets/Plugins/Android/res/xml/file_paths.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/popcorn/ProjectSettings/AndroidResolverDependencies.xml b/popcorn/ProjectSettings/AndroidResolverDependencies.xml index d1a96468..c6576a06 100644 --- a/popcorn/ProjectSettings/AndroidResolverDependencies.xml +++ b/popcorn/ProjectSettings/AndroidResolverDependencies.xml @@ -3,53 +3,20 @@ com.google.android.gms:play-services-appset:16.0.2 com.google.android.instantapps:instantapps:1.1.0 - - Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar - Assets/Plugins/Android/androidx.arch.core.core-common-2.0.0.jar - Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.0.aar - Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar - Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar - Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar - Assets/Plugins/Android/androidx.core.core-1.2.0.aar - Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar - Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar - Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar - Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar - Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar - Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar - Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar - Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar - Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar - Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar - Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar - Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar - Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar - Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar - Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar - Assets/Plugins/Android/androidx.print.print-1.0.0.aar - Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar - Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar - 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-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 - + - - + + - + \ No newline at end of file diff --git a/popcorn/ProjectSettings/ProjectSettings.asset b/popcorn/ProjectSettings/ProjectSettings.asset index 9ac3865e..732004b8 100644 --- a/popcorn/ProjectSettings/ProjectSettings.asset +++ b/popcorn/ProjectSettings/ProjectSettings.asset @@ -779,7 +779,7 @@ PlayerSettings: webGLThreadsSupport: 0 webGLDecompressionFallback: 0 scriptingDefineSymbols: - Android: TextMeshPro;JOYPAC_Volcano_OS;BANNER_ENABLE;ANDROID_GP + Android: ANDROID_GP;TextMeshPro;JOYPAC_Volcano_OS;BANNER_ENABLE CloudRendering: TextMeshPro EmbeddedLinux: TextMeshPro GameCoreXboxOne: TextMeshPro