Skip to content

Commit 095ca75

Browse files
shepherd-ljinliu9508
authored andcommitted
Merge pull request #655 from OneSignal/fix/androidlibMetaFiles
[Fix] Include OneSignalConfig.androidlib meta files
2 parents fd2b8b0 + 0812d8e commit 095ca75

22 files changed

+155
-1
lines changed

OneSignalExample/Assets/OneSignal/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Fixed
9+
- Included meta files in OneSignalConfig.androidlib to prevent asset from being ignored
10+
811
## [5.0.4]
912
### Changed
1013
- Updated included Android SDK to [5.0.3](https://github.com/OneSignal/OneSignal-Android-SDK/releases/tag/5.0.3)

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/AndroidManifest.xml.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/README.md.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/build.gradle.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/consumer-proguard.pro.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-hdpi/ic_stat_onesignal_default.png.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-mdpi/ic_stat_onesignal_default.png.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xhdpi/ic_stat_onesignal_default.png.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxhdpi/ic_stat_onesignal_default.png.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_onesignal_large_icon_default.png.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/drawable-xxxhdpi/ic_stat_onesignal_default.png.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/OneSignalConfig.androidlib/src/main/res/raw/notification.wav.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

com.onesignal.unity.android/Editor/SetupSteps/ExportAndroidResourcesStep.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ protected override bool _getIsStepCompleted() {
5050

5151
var packagePaths = Directory.GetFiles(_pluginPackagePath, "*", SearchOption.AllDirectories)
5252
.Select(path => path.Remove(0, path.LastIndexOf(_pluginName, StringComparison.InvariantCulture)));
53+
packagePaths = packagePaths.Where(file => !file.EndsWith(".meta"));
5354

5455
var exportPaths = Directory.GetFiles(_pluginExportPath, "*", SearchOption.AllDirectories)
5556
.Select(path => path.Remove(0, path.LastIndexOf(_pluginName, StringComparison.InvariantCulture)));
@@ -69,8 +70,9 @@ protected override void _runStep() {
6970
MigratePluginToAndroidlib();
7071

7172
var files = Directory.GetFiles(_pluginPackagePath, "*", SearchOption.AllDirectories);
73+
var filteredFiles = files.Where(file => !file.EndsWith(".meta"));
7274

73-
foreach (var file in files) {
75+
foreach (var file in filteredFiles) {
7476
var trimmedPath = file.Remove(0, _pluginPackagePath.Length + 1);
7577
var fileExportPath = Path.Combine(_pluginExportPath, trimmedPath);
7678
var containingPath = fileExportPath.Remove(fileExportPath.LastIndexOf(Path.DirectorySeparatorChar));

0 commit comments

Comments
 (0)