diff --git a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib.meta b/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib.meta deleted file mode 100644 index 8d9451c1..00000000 --- a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib.meta +++ /dev/null @@ -1,32 +0,0 @@ -fileFormatVersion: 2 -guid: 56a476ed5b921aa4c88ebeefa408b821 -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/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml b/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml deleted file mode 100644 index 916dcf47..00000000 --- a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/packaging_options.gradle b/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/packaging_options.gradle deleted file mode 100644 index 7a99a3a5..00000000 --- a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/packaging_options.gradle +++ /dev/null @@ -1,5 +0,0 @@ -android { - packagingOptions { - pickFirst "META-INF/kotlinx_coroutines_core.version" - } -} diff --git a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/project.properties b/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/project.properties deleted file mode 100644 index 37f1a3b7..00000000 --- a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -target=android-31 -android.library=true diff --git a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/validate_dependencies.gradle b/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/validate_dependencies.gradle deleted file mode 100644 index e8f2bb0c..00000000 --- a/Gameton-06/Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib/validate_dependencies.gradle +++ /dev/null @@ -1,97 +0,0 @@ -// Copyright (C) 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import groovy.util.XmlSlurper -import groovy.xml.XmlUtil - -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream - -configurations { - // Configuration used to resolve the artifacts of dependencies. - aarArtifacts.extendsFrom implementation -} - -/** - * Validates the Unity GMA plugin dependencies. - * Add the following snippet to Assets/Plugins/Android/mainTemplate.gradle in the Unity Editor or - * unityLibrary/build.gradle in an Android project to use this script: - *
{@code
- * gradle.projectsEvaluated {
- *     apply from: 'GoogleMobileAdsPlugin.androidlib/validate_dependencies.gradle'
- * }
- * }
- */ -task validateDependencies { - def expandedArchiveDirectory - // List of artifacts resolved from the aarArtifacts configuration. - project.configurations.aarArtifacts. - resolvedConfiguration.lenientConfiguration. - getArtifacts(Specs.satisfyAll()).findResults { - ResolvedArtifact artifact -> - File artifactTargetFile = new File(artifact.file.parent , artifact.file.name) - // Desired artifact - com.google.android.gms:play-services-ads-lite:22.4.0 - // Group ID - com.google.android.gms - // Artifact ID - play-services-ads-lite - // Since Gradle has different naming convention for the same artifact in - // * modules-2 cache - play-services-ads-lite-22.4.0.aar - // * transforms-2 cache - com.google.android.gms.play-services-ads-lite-22.4.0 - // we look for the common segment. - if (artifact.name.contains("play-services-ads-lite")) { - // Explode the archive to a temporary directory. - FileTree expandedArchive = project.zipTree(artifactTargetFile) - expandedArchive.forEach { File androidManifest -> - if (androidManifest.getName() == "AndroidManifest.xml") { - def xml = new XmlSlurper().parse(androidManifest) - def propertyNode = xml.depthFirst().find { it.name() == 'property' } - if (propertyNode) { - // Replace the node with a comment. - propertyNode.replaceNode { - mkp.comment 'android.adservices.AD_SERVICES_CONFIG property'\ - + ' removed by GoogleMobileAds Unity plugin - Release notes: '\ - + 'https://github.com/googleads/googleads-mobile-unity/releases/'\ - + 'tag/v8.6.0' - } - } - def updatedXml = XmlUtil.serialize(xml) - androidManifest.setWritable(true) - androidManifest.text = updatedXml - expandedArchiveDirectory = androidManifest.parent - } - } - // Update the artifact archive. - artifactTargetFile.withOutputStream { outputStream -> - def zipStream = new ZipOutputStream(outputStream) - file(expandedArchiveDirectory).eachFileRecurse { file -> - if (file.isFile()) { - def entry = new ZipEntry(file.name) - zipStream.putNextEntry(entry) - file.withInputStream { zipStream << it } - zipStream.closeEntry() - } - } - zipStream.close() - } - } - } - // Clean up the temporary directory. - if (expandedArchiveDirectory) delete expandedArchiveDirectory -} - -// Run the update task before unityLibrary project is built. -project(':unityLibrary:GoogleMobileAdsPlugin.androidlib') { - tasks.named('preBuild') { - dependsOn validateDependencies - } -} diff --git a/Gameton-06/Assets/Plugins/Android/googlemobileads-unity.aar b/Gameton-06/Assets/Plugins/Android/googlemobileads-unity.aar deleted file mode 100644 index 9cef167a..00000000 Binary files a/Gameton-06/Assets/Plugins/Android/googlemobileads-unity.aar and /dev/null differ diff --git a/Gameton-06/Assets/Plugins/Android/googlemobileads-unity.aar.meta b/Gameton-06/Assets/Plugins/Android/googlemobileads-unity.aar.meta deleted file mode 100644 index 63a575ad..00000000 --- a/Gameton-06/Assets/Plugins/Android/googlemobileads-unity.aar.meta +++ /dev/null @@ -1,81 +0,0 @@ -fileFormatVersion: 2 -guid: 7444d21984414ce1bff8b0ba9d474d83 -labels: -- gvh -- gvh_version-9.6.0 -- gvhp_exportpath-Plugins/Android/googlemobileads-unity.aar -timeCreated: 1480838400 -PluginImporter: - serializedVersion: 1 - iconMap: {} - executionOrder: {} - isPreloaded: 0 - platformData: - Android: - enabled: 1 - settings: - CPU: AnyCPU - Any: - enabled: 0 - settings: {} - Editor: - enabled: 1 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 1 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel: - enabled: 1 - settings: - CPU: x86 - OSXIntel64: - enabled: 1 - settings: - CPU: x86_64 - OSXUniversal: - enabled: 1 - settings: - CPU: AnyCPU - Web: - enabled: 0 - settings: {} - WebStreamed: - enabled: 0 - settings: {} - Win: - enabled: 1 - settings: - CPU: x86 - Win64: - enabled: 1 - settings: - CPU: x86_64 - WindowsStoreApps: - enabled: 0 - settings: - CPU: AnyCPU - iOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - tvOS: - enabled: 0 - settings: - CompileFlags: - FrameworkDependencies: - userData: - assetBundleName: - assetBundleVariant: