Skip to content

[Android] Make sure all Ruby file paths are flattened into single Array #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 4, 2015
Merged

[Android] Make sure all Ruby file paths are flattened into single Array #189

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c23a8e
Make sure all Ruby file paths are flattened into single Array
darinwilson Jan 22, 2015
c1faef9
Merge remote-tracking branch 'upstream/master'
darinwilson Apr 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/motion/project/template/android.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@
end
end
end
App.config.files.map { |x| File.dirname(x) }.uniq.each do |path|
App.config.files.flatten.map { |x| File.dirname(x) }.uniq.each do |path|
# Load extension files (any .java file inside the same directory of a .rb file).
Dir.glob(File.join(path, "*.java")).each do |java_ext|
class_name = File.basename(java_ext).sub(/\.java$/, '')
Expand Down