diff --git a/OneSignalExample/Assets/OneSignal/CHANGELOG.md b/OneSignalExample/Assets/OneSignal/CHANGELOG.md index a26748635..18f762b42 100644 --- 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 new file mode 100644 index 000000000..ff4d595ef --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/AndroidManifest.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 235813143c0084587adc103ea7388e44 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/README.md.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/README.md.meta new file mode 100644 index 000000000..d35ee3022 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e599536f8e098493d8ba2e242b655b52 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle.meta new file mode 100644 index 000000000..c9998f53a --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 66208aebb9b9a4fb69d33c19475a689b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 000000000..9dd4ddaa5 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a228b277bb5114323a815f318bffc96b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src.meta new file mode 100644 index 000000000..11d99be58 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b3bd822a1f1814d5cac76cc10e3acbd6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main.meta new file mode 100644 index 000000000..a3358133c --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e774cf8b768354b7099e3c97e7be22b2 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 000000000..90569ad94 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59ef453dfcf3d4b08b29c1688e540c52 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi.meta new file mode 100644 index 000000000..8fd04908d --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c2e69d20ade0643b99ac7f426bc24d9d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png.meta new file mode 100644 index 000000000..dc35c9d12 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 005e9af4b102442faaf2ba8ee7adde4c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi.meta new file mode 100644 index 000000000..bbce042f6 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50395df7d66fc44b7b034afc527d23c6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png.meta new file mode 100644 index 000000000..efe001e07 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a2921732128cd4864a11cbeba29625a8 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi.meta new file mode 100644 index 000000000..f313f5af8 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 780926c49d733476989a61871f09934e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png.meta new file mode 100644 index 000000000..b14898d04 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fa7d030d8480a4e5e8377eb585dcd024 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi.meta new file mode 100644 index 000000000..1ffd4cc28 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 13fd904f2b75e425c963d3b95c1538be +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png.meta new file mode 100644 index 000000000..67ff95a98 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6e8b000fe7b4f48139c16fc4218aaef9 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi.meta new file mode 100644 index 000000000..d66ca70ee --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5ce690e195a1146489d942aeb0d24320 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png.meta new file mode 100644 index 000000000..afe7ab2cf --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e0c41d7034e9845ae9ed815fed01124b +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png.meta new file mode 100644 index 000000000..f3e9718bf --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 379a80a88430b466db534453bd1d13ea +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 000000000..79d23969b --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ee375cecf3df46749d04a4626059689 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw/notification.wav.meta b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw/notification.wav.meta new file mode 100644 index 000000000..fee496d78 --- /dev/null +++ b/com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw/notification.wav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cd041c5eb302d47b58e48f38c4e4eb03 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/com.onesignal.unity.android/Editor/SetupSteps/ExportAndroidResourcesStep.cs b/com.onesignal.unity.android/Editor/SetupSteps/ExportAndroidResourcesStep.cs index a0bfcd3da..037cb013b 100644 --- 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));