diff --git a/Assets/Assembly-CSharp-Editor.csproj.meta b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta similarity index 74% rename from Assets/Assembly-CSharp-Editor.csproj.meta rename to Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta index f79bc3d7..b7c4cd42 100644 --- a/Assets/Assembly-CSharp-Editor.csproj.meta +++ b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package-2021.2+.unitypackage.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c86158f937dbef3469d4bed1a9cbf3f1 +guid: a55ee4efaad27d948ba5f03fc6d7bc80 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.pom.meta b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta similarity index 68% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.pom.meta rename to Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta index 29bb5d42..55927234 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.pom.meta +++ b/Assets/AllIn1SpriteShader/2DRenderer-URP-Package.unitypackage.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 1a9e614cc77eff6468b1f622986cf0c9 -labels: -- gpsr +guid: ed9b95dc6ed6d0647ad7f1a8f305385d DefaultImporter: externalObjects: {} userData: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com.meta b/Assets/ExternalDependencyManager/Editor/1.2.181.meta similarity index 77% rename from Assets/GeneratedLocalRepo/Firebase/m2repository/com.meta rename to Assets/ExternalDependencyManager/Editor/1.2.181.meta index b4fc88c1..acb54335 100644 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com.meta +++ b/Assets/ExternalDependencyManager/Editor/1.2.181.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 160d8bd7d91eebd46829dc8d73dffa66 +guid: d56698aedf291994ea8e13861bd4e071 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/GeneratedLocalRepo.meta b/Assets/GeneratedLocalRepo.meta deleted file mode 100644 index 664b68f2..00000000 --- a/Assets/GeneratedLocalRepo.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 942372e0a39170840b5107589bbc8855 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase.meta b/Assets/GeneratedLocalRepo/Firebase.meta deleted file mode 100644 index 2256dcab..00000000 --- a/Assets/GeneratedLocalRepo/Firebase.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 776f8384377bde54abe1521ad8f347a0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository.meta deleted file mode 100644 index 0b215d9c..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 730d803078e73414c946f91c90974dee -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google.meta deleted file mode 100644 index 32862ba1..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4bea0da733a9b0f4abcaf1389a6b3d26 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase.meta deleted file mode 100644 index d8b48a36..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 461d97e0073ffda4a87d6dfa065ae520 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity.meta deleted file mode 100644 index 20422c81..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 822e80bc8858b6e41ab129ab7f02ee39 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0.meta deleted file mode 100644 index 6d76f31b..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 574e99684c8cc4b4cbcfbc8cec95f83b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.aar b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.aar deleted file mode 100644 index 7bae5c4c..00000000 Binary files a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.aar and /dev/null differ diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.aar.meta deleted file mode 100644 index 7c8f738f..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: 47a6eeaae807bfb4ea8e25c6abefe912 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 0 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.pom b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.pom deleted file mode 100644 index eba65762..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-app-unity - 12.8.0 - aar - - \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.pom.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.pom.meta deleted file mode 100644 index 80de8687..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-app-unity/12.8.0/firebase-app-unity-12.8.0.pom.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 1e27de15f787a2246bc346595dea7c79 -labels: -- gpsr -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity.meta deleted file mode 100644 index e83e4120..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f43ab60f84fc23b4983b8d4140e006ab -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0.meta deleted file mode 100644 index d9cb87c2..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 513553328fe91394292e8dc61bd35b0f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.aar b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.aar deleted file mode 100644 index 2d49fc83..00000000 Binary files a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.aar and /dev/null differ diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.aar.meta b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.aar.meta deleted file mode 100644 index fc2465f6..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.aar.meta +++ /dev/null @@ -1,34 +0,0 @@ -fileFormatVersion: 2 -guid: adafda06f58216d4bad4e040bc93d2ba -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Android: Android - second: - enabled: 0 - settings: {} - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.pom b/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.pom deleted file mode 100644 index 0daa8b4b..00000000 --- a/Assets/GeneratedLocalRepo/Firebase/m2repository/com/google/firebase/firebase-messaging-unity/12.8.0/firebase-messaging-unity-12.8.0.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.google.firebase - firebase-messaging-unity - 12.8.0 - aar - - \ No newline at end of file diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn.meta b/Assets/GeneratedLocalRepo/GoogleSignIn.meta deleted file mode 100644 index 505c17cd..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0349fcb1e5762334391642aca2cd6ec9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor.meta deleted file mode 100644 index f050118b..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d29c0cdd54ad5bf42961a942a27587b6 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository.meta deleted file mode 100644 index a9b9de47..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 570dd445e1db5f043b0bed2a4b26a858 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com.meta deleted file mode 100644 index f889e5b4..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 81ba2e5a7b10b804b9b3f8f44cd08d65 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google.meta deleted file mode 100644 index 378a5ba2..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 4b12ef651963e1647bcf34b06d452359 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin.meta deleted file mode 100644 index f50ac50a..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3fbcb798450a9da458bd1ff200efc8e4 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support.meta deleted file mode 100644 index 42a565a6..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 546d95353e1ea6741b19368cca1ccb30 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4.meta deleted file mode 100644 index 39025d4b..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d3a26cbe3cb25014bbe2889e4c379bcc -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar deleted file mode 100644 index 1ebd5a13..00000000 Binary files a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar and /dev/null differ diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar.meta b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar.meta deleted file mode 100644 index 5d304c50..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.aar.meta +++ /dev/null @@ -1,29 +0,0 @@ -fileFormatVersion: 2 -guid: ed2ae7de4097e26439f6aef5df2ce991 -labels: -- gpsr -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 0 - settings: {} - - first: - Editor: Editor - second: - enabled: 1 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom b/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom deleted file mode 100644 index 1ccd2def..00000000 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - com.google.signin - google-signin-support - 1.0.4 - aar - \ No newline at end of file diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index 7e1983ed..ec3b9a06 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -1,35 +1,18 @@  - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/Plugins/Android/AndroidManifest.xml.DISABLED b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED new file mode 100644 index 00000000..7e1983ed --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Assets/Plugins/Android/AndroidManifest.xml.DISABLED.meta b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED.meta new file mode 100644 index 00000000..776bf1ab --- /dev/null +++ b/Assets/Plugins/Android/AndroidManifest.xml.DISABLED.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58a9e7fe790176b48967e5a105ce068e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/Android/AndroidManifest.xml.meta b/Assets/Plugins/Android/AndroidManifest.xml.meta index 776bf1ab..869454a2 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml.meta +++ b/Assets/Plugins/Android/AndroidManifest.xml.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 58a9e7fe790176b48967e5a105ce068e +guid: efe32d1fc5c3cfd4dbf9637f7e7bc47a TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/Android/baseProjectTemplate.gradle b/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED similarity index 100% rename from Assets/Plugins/Android/baseProjectTemplate.gradle rename to Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED diff --git a/Assets/Plugins/Android/baseProjectTemplate.gradle.meta b/Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta similarity index 100% rename from Assets/Plugins/Android/baseProjectTemplate.gradle.meta rename to Assets/Plugins/Android/baseProjectTemplate.gradle.DISABLED.meta diff --git a/Assets/Plugins/Android/launcherTemplate.gradle.DISABLED b/Assets/Plugins/Android/launcherTemplate.gradle.DISABLED new file mode 100644 index 00000000..204dd736 --- /dev/null +++ b/Assets/Plugins/Android/launcherTemplate.gradle.DISABLED @@ -0,0 +1,62 @@ +apply plugin: 'com.android.application' + +dependencies { + implementation project(':unityLibrary') + } + +android { + namespace "**NAMESPACE**" + ndkPath "**NDKPATH**" + + compileSdkVersion **APIVERSION** + buildToolsVersion '**BUILDTOOLS**' + + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + + defaultConfig { + minSdkVersion **MINSDKVERSION** + targetSdkVersion **TARGETSDKVERSION** + applicationId '**APPLICATIONID**' + ndk { + abiFilters **ABIFILTERS** + } + versionCode **VERSIONCODE** + versionName '**VERSIONNAME**' + } + + aaptOptions { + noCompress = **BUILTIN_NOCOMPRESS** + 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****PLAY_ASSET_PACKS****SPLITS** +**BUILT_APK_LOCATION** + bundle { + language { + enableSplit = false + } + density { + enableSplit = false + } + abi { + enableSplit = true + } + } +}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP** diff --git a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.meta b/Assets/Plugins/Android/launcherTemplate.gradle.DISABLED.meta similarity index 68% rename from Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.meta rename to Assets/Plugins/Android/launcherTemplate.gradle.DISABLED.meta index 5ade7d7f..bc0fdeff 100644 --- a/Assets/GeneratedLocalRepo/GoogleSignIn/Editor/m2repository/com/google/signin/google-signin-support/1.0.4/google-signin-support-1.0.4.pom.meta +++ b/Assets/Plugins/Android/launcherTemplate.gradle.DISABLED.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 1847715e547531b4d91b87619689c0f1 -labels: -- gpsr +guid: 3eeb28ef1b18e234cbf44c48bfaf17d5 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/Android/mainTemplate.gradle b/Assets/Plugins/Android/mainTemplate.gradle index 835b4730..e48416eb 100644 --- a/Assets/Plugins/Android/mainTemplate.gradle +++ b/Assets/Plugins/Android/mainTemplate.gradle @@ -8,45 +8,11 @@ ext { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - // Android Resolver Dependencies Start - implementation 'androidx.constraintlayout:constraintlayout:2.1.4' // GoogleMobileAds - implementation 'com.google.android.gms:play-services-ads:23.2.0' // AdMob - implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' // IronSource - implementation 'com.google.android.gms:play-services-auth:20.7.0' // Updated from old version - implementation 'com.google.android.gms:play-services-base:18.2.0' // Updated to match SignIn - implementation 'com.google.android.gms:play-services-basement:18.1.0' - implementation 'com.google.android.ump:user-messaging-platform:2.2.0' - - // Firebase - use only ONE version per package - implementation 'com.google.firebase:firebase-analytics:22.4.0' - implementation 'com.google.firebase:firebase-app-unity:12.8.0' - implementation 'com.google.firebase:firebase-common:21.0.0' - implementation 'com.google.firebase:firebase-iid:21.1.0' - implementation 'com.google.firebase:firebase-messaging:24.1.1' - implementation 'com.google.firebase:firebase-messaging-unity:12.8.0' - implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0' - - // IronSource - implementation 'com.ironsource.sdk:mediationsdk:7.3.1.1' - - // Core desugaring (to fix dexing errors) - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2' - // 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 { namespace "com.unity3d.player" diff --git a/Assets/Plugins/Android/settingsTemplate.gradle b/Assets/Plugins/Android/settingsTemplate.gradle index 764ccd0d..939fa3d5 100644 --- a/Assets/Plugins/Android/settingsTemplate.gradle +++ b/Assets/Plugins/Android/settingsTemplate.gradle @@ -16,22 +16,6 @@ dependencyResolutionManagement { **ARTIFACTORYREPOSITORY** google() mavenCentral() -// Android Resolver Repos Start - def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/") - maven { - url (unityProjectPath + "/Assets/GeneratedLocalRepo/Firebase/m2repository") // Assets/Firebase/Editor/AppDependencies.xml:22, Assets/Firebase/Editor/MessagingDependencies.xml:24 - } - maven { - url "https://maven.google.com/" // Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:7, Assets/GoogleMobileAds/Editor/GoogleMobileAdsDependencies.xml:12, Assets/GoogleMobileAds/Editor/GoogleUmpDependencies.xml:7, Assets/IronSource/Editor/IronSourceSDKDependencies.xml:17, Assets/IronSource/Editor/IronSourceSDKDependencies.xml:25 - } - maven { - url (unityProjectPath + "/Assets/GoogleSignIn/Editor/m2repository") // Assets/GoogleSignIn/Editor/GoogleSignInSupportDependencies.xml:9 - } - maven { - url "https://android-sdk.is.com/" // Assets/IronSource/Editor/IronSourceSDKDependencies.xml:9 - } - mavenLocal() -// Android Resolver Repos End flatDir { dirs "${project(':unityLibrary').projectDir}/libs" }