diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e0f80357..d17e0c1de 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,28 @@ +## 0.2.0 + +##### Breaking + +* Jazzy now only supports projects using Swift 1.2. + [JP Simard](https://github.com/jpsim) + [#170](https://github.com/realm/jazzy/issues/170) + +* Increase default minimum ACL to public. + [JP Simard](https://github.com/jpsim) + [#186](https://github.com/realm/jazzy/issues/186) + +##### Enhancements + +* Use `key.accessibility` to determine ACL (value coming from SourceKit, which + is generally more accurate than parsing the declaration for an accessibility + keyword). + [JP Simard](https://github.com/jpsim) + [#185](https://github.com/realm/jazzy/issues/185) + +##### Bug Fixes + +* None. + + ## 0.1.6 ##### Breaking diff --git a/Gemfile.lock b/Gemfile.lock index 695b93fba..3cb489ad9 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - jazzy (0.1.6) + jazzy (0.2.0) cocoapods (~> 0.36.0.rc.1) mustache (~> 0.99) open4 @@ -28,10 +28,10 @@ GEM clintegracon (0.5.3) colored (~> 1.2) diffy - cocoapods (0.36.3) + cocoapods (0.36.4) activesupport (>= 3.2.15) claide (~> 0.8.1) - cocoapods-core (= 0.36.3) + cocoapods-core (= 0.36.4) cocoapods-downloader (~> 0.9.0) cocoapods-plugins (~> 0.4.1) cocoapods-trunk (~> 0.6.0) @@ -42,7 +42,7 @@ GEM nap (~> 0.8) open4 (~> 1.3) xcodeproj (~> 0.23.1) - cocoapods-core (0.36.3) + cocoapods-core (0.36.4) activesupport (>= 3.2.15) fuzzy_match (~> 2.0.4) nap (~> 0.8.0) @@ -62,7 +62,7 @@ GEM i18n (0.7.0) json (1.8.2) metaclass (0.0.4) - minitest (5.5.1) + minitest (5.6.0) mocha (1.1.0) metaclass (~> 0.0.1) mocha-on-bacon (0.2.2) @@ -80,7 +80,7 @@ GEM bacon (~> 1.2) rainbow (2.0.0) rake (10.3.2) - redcarpet (3.2.2) + redcarpet (3.2.3) rouge (1.8.0) rubocop (0.26.1) astrolabe (~> 1.3) diff --git a/SourceKitten b/SourceKitten index a85377f81..d72c039e4 160000 --- a/SourceKitten +++ b/SourceKitten @@ -1 +1 @@ -Subproject commit a85377f8156641c6ffcf37080ccecd86d27a3e90 +Subproject commit d72c039e4e2982cbc81a1091e0a35022b0c2dcda diff --git a/lib/jazzy/SourceKitten/Commandant.framework/Modules b/lib/jazzy/SourceKitten/Commandant.framework/Modules deleted file mode 120000 index 5736f3186..000000000 --- a/lib/jazzy/SourceKitten/Commandant.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Commandant b/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Commandant index 92149b3bf..cfccb659d 100755 Binary files a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Commandant and b/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Commandant differ diff --git a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftdoc b/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 30d8a782f..000000000 Binary files a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftmodule b/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index b3aa90f9e..000000000 Binary files a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/module.modulemap b/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index f767ff0f1..000000000 --- a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,10 +0,0 @@ -framework module Commandant { - umbrella header "Commandant.h" - - export * - module * { export * } -} - -module Commandant.Swift { - header "Commandant-Swift.h" -} diff --git a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Resources/Info.plist b/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Resources/Info.plist index bdc928fec..95a19de7a 100644 --- a/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Resources/Info.plist +++ b/lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14C1514 + 14D136 CFBundleDevelopmentRegion en CFBundleExecutable @@ -25,17 +25,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6C131e + 6D1002 DTPlatformVersion GM DTSDKBuild - 14A383 + 14D125 DTSDKName macosx10.10 DTXcode - 0620 + 0631 DTXcodeBuild - 6C131e + 6D1002 NSHumanReadableCopyright Copyright © 2014 Carthage. All rights reserved. diff --git a/lib/jazzy/SourceKitten/LlamaKit.framework/Modules b/lib/jazzy/SourceKitten/LlamaKit.framework/Modules deleted file mode 120000 index 5736f3186..000000000 --- a/lib/jazzy/SourceKitten/LlamaKit.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/LlamaKit b/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/LlamaKit index 0156f29c7..04842425f 100755 Binary files a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/LlamaKit and b/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/LlamaKit differ diff --git a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftdoc b/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index eabef86be..000000000 Binary files a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftmodule b/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 24f529a82..000000000 Binary files a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/module.modulemap b/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index 8f185bead..000000000 --- a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,10 +0,0 @@ -framework module LlamaKit { - umbrella header "LlamaKit.h" - - export * - module * { export * } -} - -module LlamaKit.Swift { - header "LlamaKit-Swift.h" -} diff --git a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Resources/Info.plist b/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Resources/Info.plist index f4569d1c6..9e40d9338 100644 --- a/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Resources/Info.plist +++ b/lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14C1514 + 14D136 CFBundleDevelopmentRegion en CFBundleExecutable @@ -25,17 +25,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6C131e + 6D1002 DTPlatformVersion GM DTSDKBuild - 14A383 + 14D125 DTSDKName macosx10.10 DTXcode - 0620 + 0631 DTXcodeBuild - 6C131e + 6D1002 NSHumanReadableCopyright Copyright © 2014 Rob Napier. All rights reserved. UIDeviceFamily diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Modules b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Modules deleted file mode 120000 index 5736f3186..000000000 --- a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Resources b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Resources new file mode 120000 index 000000000..953ee36f3 --- /dev/null +++ b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources \ No newline at end of file diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/SWXMLHash b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/SWXMLHash new file mode 120000 index 000000000..fb92f1c8e --- /dev/null +++ b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/SWXMLHash @@ -0,0 +1 @@ +Versions/Current/SWXMLHash \ No newline at end of file diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/Resources/Info.plist b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/Resources/Info.plist new file mode 100644 index 000000000..6c44bfeae --- /dev/null +++ b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/Resources/Info.plist @@ -0,0 +1,45 @@ + + + + + BuildMachineOSBuild + 14D136 + CFBundleDevelopmentRegion + en + CFBundleExecutable + SWXMLHash + CFBundleIdentifier + drmohundro.SWXMLHash + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + SWXMLHash + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + DTCompiler + com.apple.compilers.llvm.clang.1_0 + DTPlatformBuild + 6D1002 + DTPlatformVersion + GM + DTSDKBuild + 14D125 + DTSDKName + macosx10.10 + DTXcode + 0631 + DTXcodeBuild + 6D1002 + UIDeviceFamily + + 1 + 2 + + + diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/SWXMLHash b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/SWXMLHash new file mode 100755 index 000000000..72023e486 Binary files /dev/null and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/SWXMLHash differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/Current b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/Current new file mode 120000 index 000000000..8c7e5a667 --- /dev/null +++ b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/Current @@ -0,0 +1 @@ +A \ No newline at end of file diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Modules b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Modules deleted file mode 120000 index 5736f3186..000000000 --- a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Modules +++ /dev/null @@ -1 +0,0 @@ -Versions/Current/Modules \ No newline at end of file diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftdoc b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 5c6196362..000000000 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftmodule b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index d729b7954..000000000 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/module.modulemap b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index a7fce8514..000000000 --- a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,10 +0,0 @@ -framework module SwiftXPC { - umbrella header "SwiftXPC.h" - - export * - module * { export * } -} - -module SwiftXPC.Swift { - header "SwiftXPC-Swift.h" -} diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Resources/Info.plist b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Resources/Info.plist index bf2289fc2..8e94e3b23 100644 --- a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Resources/Info.plist +++ b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14C1514 + 14D136 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.0.1 + 1.0.0 CFBundleSignature ???? CFBundleVersion @@ -25,17 +25,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6C131e + 6D1002 DTPlatformVersion GM DTSDKBuild - 14A383 + 14D125 DTSDKName macosx10.10 DTXcode - 0620 + 0631 DTXcodeBuild - 6C131e + 6D1002 NSHumanReadableCopyright Copyright © 2014 JP Simard. All rights reserved. diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/SwiftXPC b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/SwiftXPC index a9c4cb3bd..ad952aab8 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/SwiftXPC and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/SwiftXPC differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCore.dylib b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCore.dylib index 75e8c88df..e7cee9c74 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCore.dylib and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCore.dylib differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCoreGraphics.dylib b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCoreGraphics.dylib index 11e7358e8..5eb4c7289 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCoreGraphics.dylib and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCoreGraphics.dylib differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDarwin.dylib b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDarwin.dylib index 45cb4e780..5697e4dc3 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDarwin.dylib and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDarwin.dylib differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDispatch.dylib b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDispatch.dylib index e4843983a..726bf66bf 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDispatch.dylib and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDispatch.dylib differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftFoundation.dylib b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftFoundation.dylib index c5f6e09ff..56d221027 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftFoundation.dylib and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftFoundation.dylib differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib index 79aaa0034..cfa1cd507 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftSecurity.dylib b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftSecurity.dylib index 69072fafe..55dd579f1 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftSecurity.dylib and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftSecurity.dylib differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftdoc b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftdoc deleted file mode 100644 index 862e504fa..000000000 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftdoc and /dev/null differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftmodule b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftmodule deleted file mode 100644 index 4486a6558..000000000 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftmodule and /dev/null differ diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/module.modulemap b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/module.modulemap deleted file mode 100644 index ee4fdb557..000000000 --- a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/module.modulemap +++ /dev/null @@ -1,10 +0,0 @@ -framework module SourceKittenFramework { - umbrella header "SourceKittenFramework.h" - - export * - module * { export * } -} - -module SourceKittenFramework.Swift { - header "SourceKittenFramework-Swift.h" -} diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Resources/Info.plist b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Resources/Info.plist index a6b6941f7..0d4b477a7 100644 --- a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Resources/Info.plist +++ b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 14C1514 + 14D136 CFBundleDevelopmentRegion en CFBundleExecutable @@ -17,7 +17,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.3.0 + 0.4.0 CFBundleSignature ???? CFBundleVersion @@ -25,17 +25,17 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 6C131e + 6D1002 DTPlatformVersion GM DTSDKBuild - 14A383 + 14D125 DTSDKName macosx10.10 DTXcode - 0620 + 0631 DTXcodeBuild - 6C131e + 6D1002 NSHumanReadableCopyright Copyright © 2015 SourceKitten. All rights reserved. diff --git a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/SourceKittenFramework b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/SourceKittenFramework index 8b5de8449..98f8914be 100755 Binary files a/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/SourceKittenFramework and b/lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/SourceKittenFramework differ diff --git a/lib/jazzy/SourceKitten/sourcekitten b/lib/jazzy/SourceKitten/sourcekitten index 8f3d2c3d0..9277eb215 100755 Binary files a/lib/jazzy/SourceKitten/sourcekitten and b/lib/jazzy/SourceKitten/sourcekitten differ diff --git a/lib/jazzy/config.rb b/lib/jazzy/config.rb index 47c200d43..d2ec47b13 100644 --- a/lib/jazzy/config.rb +++ b/lib/jazzy/config.rb @@ -39,7 +39,7 @@ def initialize self.clean = false self.docset_platform = 'jazzy' self.version = '1.0' - self.min_acl = SourceDeclaration::AccessControlLevel.internal + self.min_acl = SourceDeclaration::AccessControlLevel.public self.skip_undocumented = false self.source_directory = Pathname.pwd end @@ -126,11 +126,11 @@ def self.parse! opt.on('--min-acl [private | internal | public]', 'minimum access control level to document \ - (default is internal)') do |acl| + (default is public)') do |acl| if acl == 'private' config.min_acl = SourceDeclaration::AccessControlLevel.private - elsif acl == 'public' - config.min_acl = SourceDeclaration::AccessControlLevel.public + elsif acl == 'internal' + config.min_acl = SourceDeclaration::AccessControlLevel.internal end end diff --git a/lib/jazzy/gem_version.rb b/lib/jazzy/gem_version.rb index 32d2b9950..688dcf6b0 100755 --- a/lib/jazzy/gem_version.rb +++ b/lib/jazzy/gem_version.rb @@ -1,3 +1,3 @@ module Jazzy - VERSION = '0.1.6' unless defined? Jazzy::VERSION + VERSION = '0.2.0' unless defined? Jazzy::VERSION end diff --git a/lib/jazzy/source_declaration/access_control_level.rb b/lib/jazzy/source_declaration/access_control_level.rb index 01398d727..ba57936c1 100644 --- a/lib/jazzy/source_declaration/access_control_level.rb +++ b/lib/jazzy/source_declaration/access_control_level.rb @@ -5,26 +5,54 @@ class AccessControlLevel attr_reader :level - def initialize(declaration_string) - if declaration_string =~ /private\ / + ACCESSIBILITY_PRIVATE = 'source.lang.swift.accessibility.private' + ACCESSIBILITY_INTERNAL = 'source.lang.swift.accessibility.internal' + ACCESSIBILITY_PUBLIC = 'source.lang.swift.accessibility.public' + + def initialize(accessibility) + if accessibility == ACCESSIBILITY_PRIVATE @level = :private - elsif declaration_string =~ /public\ / + elsif accessibility == ACCESSIBILITY_INTERNAL + @level = :internal + elsif accessibility == ACCESSIBILITY_PUBLIC @level = :public else - @level = :internal + raise "cannot initialize AccessControlLevel with '#{accessibility}'" + end + end + + def self.from_doc(doc) + accessibility = doc['key.accessibility'] + if accessibility + acl = new(accessibility) + if acl + return acl + end + end + acl = from_explicit_declaration(doc['key.parsed_declaration']) + acl || AccessControlLevel.public # fallback on public ACL + end + + def self.from_explicit_declaration(declaration_string) + if declaration_string =~ /private\ / + return AccessControlLevel.private + elsif declaration_string =~ /public\ / + return AccessControlLevel.public + elsif declaration_string =~ /internal\ / + return AccessControlLevel.internal end end def self.private - AccessControlLevel.new('private ') + new(ACCESSIBILITY_PRIVATE) end def self.internal - AccessControlLevel.new('internal ') + new(ACCESSIBILITY_INTERNAL) end def self.public - AccessControlLevel.new('public ') + new(ACCESSIBILITY_PUBLIC) end LEVELS = { diff --git a/lib/jazzy/sourcekitten.rb b/lib/jazzy/sourcekitten.rb index 94380e968..7ae5e926b 100644 --- a/lib/jazzy/sourcekitten.rb +++ b/lib/jazzy/sourcekitten.rb @@ -12,6 +12,7 @@ module Jazzy module SourceKitten @documented_count = 0 @undocumented_tokens = [] + @expected_swift_version = '1.2' # Group root-level docs by type and add as children to a group doc element def self.group_docs(docs, type) @@ -56,7 +57,7 @@ def self.assert_xcode_location expected_xcode_select_path = Pathname('/Applications/Xcode.app/Contents/Developer') return if xcode_developer_directory == expected_xcode_select_path - raise 'Please install or symlink Xcode 6.1 or 6.2 in ' \ + raise 'Please install or symlink Xcode 6.3 in ' \ "#{expected_xcode_select_path} and set as active developer " \ 'directory by running `sudo xcode-select -s ' \ "#{expected_xcode_select_path}`" @@ -70,9 +71,8 @@ def self.xcode_developer_directory def self.assert_swift_version swift_version = `xcrun swift --version` =~ /Swift version ([\d\.]+)/ && Regexp.last_match[1] - expected_swift_version = '1.1' - return if swift_version == expected_swift_version - raise "Jazzy only works with Swift #{expected_swift_version}." + return if swift_version == @expected_swift_version + raise "Jazzy only works with Swift #{@expected_swift_version}." end # Run sourcekitten with given arguments and return STDOUT @@ -104,8 +104,7 @@ def self.should_document?(doc) # Always document extensions, since we can't tell what ACL they are return true if doc['key.kind'] == 'source.lang.swift.decl.extension' - SourceDeclaration::AccessControlLevel.new(doc['key.annotated_decl']) >= - @min_acl + SourceDeclaration::AccessControlLevel.from_doc(doc) >= @min_acl end def self.process_undocumented_token(doc, declaration) @@ -211,10 +210,8 @@ def self.make_source_declarations(docs) declaration.usr = doc['key.usr'] declaration.name = doc['key.name'] declaration.mark = current_mark - acl = SourceDeclaration::AccessControlLevel.new( - doc['key.annotated_decl'], - ) - declaration.access_control_level = acl + declaration.access_control_level = + SourceDeclaration::AccessControlLevel.from_doc(doc) declaration.start_line = doc['key.parsed_scope.start'] declaration.end_line = doc['key.parsed_scope.end'] diff --git a/spec/integration_specs b/spec/integration_specs index aaa0971d4..2032cfd7f 160000 --- a/spec/integration_specs +++ b/spec/integration_specs @@ -1 +1 @@ -Subproject commit aaa0971d45a4bdb3fdb3b4ae4fa64b65c5ca8276 +Subproject commit 2032cfd7fff164158a25ed8431f981a7b836a366 diff --git a/spec/sourcekitten_spec.rb b/spec/sourcekitten_spec.rb index 66d09078a..bcb8a2bea 100644 --- a/spec/sourcekitten_spec.rb +++ b/spec/sourcekitten_spec.rb @@ -15,17 +15,17 @@ module Jazzy it 'validates the current xcode version' do SourceKitten.stubs(:`).returns <<-O -Swift version 1.1 (swift-600.0.57.4) -Target: x86_64-apple-darwin14.1.0 +Apple Swift version 1.2 (swiftlang-602.0.49.6 clang-602.0.49) +Target: x86_64-apple-darwin14.3.0 O should.not.raise { SourceKitten.assert_swift_version } SourceKitten.stubs(:`).returns <<-O -Apple Swift version 1.2 (swiftlang-602.0.47.4 clang-602.0.48) +Swift version 1.1 (swift-600.0.57.4) Target: x86_64-apple-darwin14.1.0 O should.raise { SourceKitten.assert_swift_version }.message.should - .match /Jazzy.*Swift 1\.1/ + .match /Jazzy.*Swift 1\.2/ end end end