Merge pull request #655 from OneSignal/fix/androidlibMetaFiles

[Fix] Include OneSignalConfig.androidlib meta files
OneSignal · Mar 4, 2024 · 095ca75 · 095ca75
2 parents fd2b8b0 + 0812d8e
commit 095ca75
Show file tree

Hide file tree

Showing 22 changed files with 155 additions and 1 deletion.
diff --git a/OneSignalExample/Assets/OneSignal/CHANGELOG.md b/OneSignalExample/Assets/OneSignal/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Fixed
+- Included meta files in OneSignalConfig.androidlib to prevent asset from being ignored
+
 ## [5.0.4]
 ### Changed
 - Updated included Android SDK to [5.0.3](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.3)

diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/AndroidManifest.xml.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/AndroidManifest.xml.meta
diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/README.md.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/README.md.meta
diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle.meta
diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro.meta
diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src.meta
diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main.meta
diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res.meta
diff --git a/...onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi.meta b/...onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi.meta
diff --git a/.../OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png.meta b/.../OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png.meta
diff --git a/...onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi.meta b/...onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi.meta
diff --git a/.../OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png.meta b/.../OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png.meta
diff --git a/...nesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi.meta b/...nesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi.meta
diff --git a/...OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png.meta b/...OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png.meta
diff --git a/...esignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi.meta b/...esignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi.meta
diff --git a/...neSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png.meta b/...neSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png.meta
diff --git a/...signal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi.meta b/...signal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi.meta
diff --git a/...lConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png.meta b/...lConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png.meta
diff --git a/...eSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png.meta b/...eSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png.meta
diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw.meta
diff --git a/...al.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw/notification.wav.meta b/...al.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw/notification.wav.meta
diff --git a/com.onesignal.unity.android/Editor/SetupSteps/ExportAndroidResourcesStep.cs b/com.onesignal.unity.android/Editor/SetupSteps/ExportAndroidResourcesStep.cs
@@ -50,6 +50,7 @@ protected override bool _getIsStepCompleted() {
 
             var packagePaths = Directory.GetFiles(_pluginPackagePath, "*", SearchOption.AllDirectories)
                .Select(path => path.Remove(0, path.LastIndexOf(_pluginName, StringComparison.InvariantCulture)));
+            packagePaths = packagePaths.Where(file => !file.EndsWith(".meta"));
 
             var exportPaths = Directory.GetFiles(_pluginExportPath, "*", SearchOption.AllDirectories)
                .Select(path => path.Remove(0, path.LastIndexOf(_pluginName, StringComparison.InvariantCulture)));
@@ -69,8 +70,9 @@ protected override void _runStep() {
             MigratePluginToAndroidlib();
 
             var files = Directory.GetFiles(_pluginPackagePath, "*", SearchOption.AllDirectories);
+            var filteredFiles = files.Where(file => !file.EndsWith(".meta"));
 
-            foreach (var file in files) {
+            foreach (var file in filteredFiles) {
                 var trimmedPath    = file.Remove(0, _pluginPackagePath.Length + 1);
                 var fileExportPath = Path.Combine(_pluginExportPath, trimmedPath);
                 var containingPath = fileExportPath.Remove(fileExportPath.LastIndexOf(Path.DirectorySeparatorChar));