diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ec65d424..428c491dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,10 @@ ##### Bug Fixes -* None. +* In Swift symbolgraph mode, stop including extensions to types that are beneath + the minimum ACL. + [John Fairhurst](https://github.com/johnfairh) + [#1291](https://github.com/realm/jazzy/issues/1291) ## 0.14.1 diff --git a/lib/jazzy/symbol_graph.rb b/lib/jazzy/symbol_graph.rb index ba10308f4..81d2850c7 100644 --- a/lib/jazzy/symbol_graph.rb +++ b/lib/jazzy/symbol_graph.rb @@ -28,7 +28,7 @@ def self.build(config) Dir[tmp_dir + '/*.symbols.json'].map do |filename| # The @ part is for extensions in our module (before the @) # of types in another module (after the @). - filename =~ /(.*?)(@(.*?))?\.symbols/ + File.basename(filename) =~ /(.*?)(@(.*?))?\.symbols/ module_name = Regexp.last_match[3] || Regexp.last_match[1] { filename => diff --git a/spec/integration_specs b/spec/integration_specs index f57be9bf6..ccab94e22 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit f57be9bf6ab376e9239615c3ca304279571b3e9f +Subproject commit ccab94e225e1d62f27889deae98d815ecaef26a6