Skip to content

Commit

Permalink
Merge pull request #562 from realm/jp-unexposed
Browse files Browse the repository at this point in the history 
Fix crash when using unexposed declarations in Objective-C
  • Loading branch information
@jpsim
jpsim committed May 19, 2016
2 parents 3dfc6af + 05997f7 commit 134ae79
Show file tree
Hide file tree
Showing 19 changed files with 25 additions and 18 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
* Uses GitHub-Flavored Markdown syntax for anchors when rendering README pages.
[Zachary Waldowski](https://github.com/zwaldowski)
[#524](https://github.com/realm/jazzy/issues/524)
* Fix crash when using unexposed declarations in Objective-C.
[JP Simard](https://github.com/jpsim)
[#543](https://github.com/realm/jazzy/issues/543)

## 0.6.0

Expand Down
2 changes: 1 addition & 1 deletion SourceKitten
Submodule SourceKitten updated 23 files
+32 −0 CHANGELOG.md
+3 −3 Cartfile.resolved
+1 −1 Carthage/Checkouts/Commandant
+1 −1 Carthage/Checkouts/Result
+1 −1 Carthage/Checkouts/SWXMLHash
+1 −1 Package.swift
+1 −1 Source/SourceKittenFramework/Info.plist
+3 −0 Source/SourceKittenFramework/ObjCDeclarationKind.swift
+10 −0 Source/SourceKittenFramework/Request.swift
+23 −23 Source/sourcekitten/CompleteCommand.swift
+23 −23 Source/sourcekitten/DocCommand.swift
+39 −0 Source/sourcekitten/IndexCommand.swift
+1 −1 Source/sourcekitten/Info.plist
+18 −18 Source/sourcekitten/StructureCommand.swift
+18 −18 Source/sourcekitten/SyntaxCommand.swift
+1 −1 Source/sourcekitten/VersionCommand.swift
+1 −0 Source/sourcekitten/main.swift
+534 −0 Tests/SourceKittenFramework/Fixtures/BicycleIndex.json
+856 −386 Tests/SourceKittenFramework/Fixtures/Commandant.json
+1 −0 Tests/SourceKittenFramework/Fixtures/Realm.json
+21 −0 Tests/SourceKittenFramework/SourceKitTests.swift
+18 −19 Tests/SourceKittenFramework/SwiftDocsTests.swift
+4 −0 sourcekitten.xcodeproj/project.pbxproj
Binary file modified ...ittenFramework.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Commandant
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions ...work.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>15F24b</string>
<string>15F34</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>15E60</string>
<key>DTSDKName</key>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0730</string>
<string>0731</string>
<key>DTXcodeBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Carthage. All rights reserved.</string>
</dict>
Expand Down
8 changes: 4 additions & 4 deletions ...ramework.framework/Versions/A/Frameworks/Result.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>15F24b</string>
<string>15F34</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>15E60</string>
<key>DTSDKName</key>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0730</string>
<string>0731</string>
<key>DTXcodeBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 Rob Rix. All rights reserved.</string>
</dict>
Expand Down
Binary file modified .../SourceKittenFramework.framework/Versions/A/Frameworks/Result.framework/Versions/A/Result
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions ...ework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>15F24b</string>
<string>15F34</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>15E60</string>
<key>DTSDKName</key>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0730</string>
<string>0731</string>
<key>DTXcodeBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
Expand Down
Binary file modified ...eKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/SWXMLHash
View file
Binary file not shown.
Binary file modified ...itten/Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCore.dylib
View file
Binary file not shown.
Binary file modified ...ameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCoreGraphics.dylib
View file
Binary file not shown.
Binary file modified ...ten/Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDarwin.dylib
View file
Binary file not shown.
Binary file modified ...n/Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDispatch.dylib
View file
Binary file not shown.
Binary file modified ...Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftFoundation.dylib
View file
Binary file not shown.
Binary file added ...tten/Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftIOKit.dylib
View file
Binary file not shown.
Binary file modified ...Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions ...y/SourceKitten/Frameworks/SourceKittenFramework.framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>15F24b</string>
<string>15F34</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.12.1</string>
<string>0.12.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
Expand All @@ -29,17 +29,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>15E60</string>
<key>DTSDKName</key>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0730</string>
<string>0731</string>
<key>DTXcodeBuild</key>
<string>7D175</string>
<string>7D1014</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 SourceKitten. All rights reserved.</string>
</dict>
Expand Down
Binary file modified .../SourceKitten/Frameworks/SourceKittenFramework.framework/Versions/A/SourceKittenFramework
View file
Binary file not shown.
Binary file modified lib/jazzy/SourceKitten/bin/sourcekitten
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions lib/jazzy/source_declaration/type.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ def ==(other)
TYPES = {
# Objective-C

'sourcekitten.source.lang.objc.decl.unexposed' => {
jazzy: 'Unexposed',
dash: 'Unexposed',
}.freeze,
'sourcekitten.source.lang.objc.decl.category' => {
jazzy: 'Category',
dash: 'Extension',
Expand Down

0 comments on commit 134ae79

Please sign in to comment.