diff --git a/Game/Assets/Plugins/Android/FirebaseApp.androidlib.meta b/Game/Assets/Plugins/Android/FirebaseApp.androidlib.meta index 3177293..6c0c178 100644 --- a/Game/Assets/Plugins/Android/FirebaseApp.androidlib.meta +++ b/Game/Assets/Plugins/Android/FirebaseApp.androidlib.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8a215058321cc49e3b5bb833bee31cfe +guid: bbbf43024a7801e429254841b26e7b35 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/Game/Assets/Plugins/Android/gradleTemplate.properties b/Game/Assets/Plugins/Android/gradleTemplate.properties index 8704680..a079eb2 100644 --- a/Game/Assets/Plugins/Android/gradleTemplate.properties +++ b/Game/Assets/Plugins/Android/gradleTemplate.properties @@ -1,8 +1,4 @@ org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M org.gradle.parallel=true unityStreamingAssets=**STREAMING_ASSETS** -# Android Resolver Properties Start -android.useAndroidX=true -android.enableJetifier=true -# Android Resolver Properties End **ADDITIONAL_PROPERTIES** diff --git a/Game/Assets/Plugins/Android/mainTemplate.gradle b/Game/Assets/Plugins/Android/mainTemplate.gradle index d98a109..c8eb3f4 100644 --- a/Game/Assets/Plugins/Android/mainTemplate.gradle +++ b/Game/Assets/Plugins/Android/mainTemplate.gradle @@ -3,30 +3,8 @@ apply plugin: 'com.android.library' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) -// Android Resolver Dependencies Start - implementation 'com.google.android.gms:play-services-base:18.5.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:17 - implementation 'com.google.firebase:firebase-analytics:22.2.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:15 - implementation 'com.google.firebase:firebase-app-unity:12.6.0' // Assets/Firebase/Editor/AppDependencies.xml:22 - implementation 'com.google.firebase:firebase-auth:23.2.0' // Assets/Firebase/Editor/AuthDependencies.xml:13 - implementation 'com.google.firebase:firebase-auth-unity:12.6.0' // Assets/Firebase/Editor/AuthDependencies.xml:20 - implementation 'com.google.firebase:firebase-common:21.0.0' // Assets/Firebase/Editor/AppDependencies.xml:13 - implementation 'com.google.firebase:firebase-database:21.0.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:13 - implementation 'com.google.firebase:firebase-database-unity:12.6.0' // Assets/Firebase/Editor/DatabaseDependencies.xml:22 -// Android Resolver Dependencies End **DEPS**} -// Android Resolver Exclusions Start -android { - packagingOptions { - exclude ('/lib/armeabi/*' + '*') - exclude ('/lib/armeabi-v7a/*' + '*') - exclude ('/lib/mips/*' + '*') - exclude ('/lib/mips64/*' + '*') - exclude ('/lib/x86/*' + '*') - exclude ('/lib/x86_64/*' + '*') - } -} -// Android Resolver Exclusions End android { namespace "com.unity3d.player" ndkPath "**NDKPATH**"