-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix handling of packages with unexpected files.
Some file browsers helpfully create extra hidden files in any directory they view. It may have been better to just ignore anything without a module.json, but #106 made module.json optional, so technically any directory is a valid module now and we need a new schema revision to change that behavior. We could alternatively add an explicit module list to prefab.json, but that would also require a new schema revision. For now, just ignore all files (fixes the .DS_Store case) and any hidden directories (just in case).
- Loading branch information
Showing
12 changed files
with
62 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
...ogle/prefab/cli/packages/has_unexpected_files/modules/bar/libs/android.arm64-v8a/abi.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"abi": "arm64-v8a", | ||
"api": 21, | ||
"ndk": 19, | ||
"stl": "c++_shared" | ||
} |
Empty file.
6 changes: 6 additions & 0 deletions
6
...le/prefab/cli/packages/has_unexpected_files/modules/bar/libs/android.armeabi-v7a/abi.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"abi": "armeabi-v7a", | ||
"api": 16, | ||
"ndk": 19, | ||
"stl": "c++_shared" | ||
} |
Empty file.
6 changes: 6 additions & 0 deletions
6
...com/google/prefab/cli/packages/has_unexpected_files/modules/bar/libs/android.x86/abi.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"abi": "x86", | ||
"api": 16, | ||
"ndk": 19, | ||
"stl": "c++_shared" | ||
} |
Empty file.
6 changes: 6 additions & 0 deletions
6
.../google/prefab/cli/packages/has_unexpected_files/modules/bar/libs/android.x86_64/abi.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"abi": "x86_64", | ||
"api": 21, | ||
"ndk": 19, | ||
"stl": "c++_shared" | ||
} |
Empty file.
Empty file.
6 changes: 6 additions & 0 deletions
6
cli/src/test/resources/com/google/prefab/cli/packages/has_unexpected_files/prefab.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{ | ||
"schema_version": 1, | ||
"name": "has_unexpected_files", | ||
"version": "1", | ||
"dependencies": [] | ||
} |