Skip to content

Commit

Permalink
Merge pull request #213 from realm/swift-1.2
Browse files Browse the repository at this point in the history 
Support Swift 1.2
  • Loading branch information
@jpsim
jpsim committed Apr 23, 2015
2 parents ebf6518 + 9c208a6 commit e7e01f9
Show file tree
Hide file tree
Showing 46 changed files with 154 additions and 100 deletions.
25 changes: 25 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion SourceKitten
Submodule SourceKitten updated 51 files
+4 −1 .gitmodules
+16 −0 CHANGELOG.md
+2 −1 Cartfile
+2 −2 Cartfile.private
+5 −4 Cartfile.resolved
+1 −1 Carthage/Checkouts/Commandant
+1 −1 Carthage/Checkouts/LlamaKit
+1 −0 Carthage/Checkouts/SWXMLHash
+1 −1 Carthage/Checkouts/SwiftXPC
+1 −1 Carthage/Checkouts/xcconfigs
+2 −2 README.md
+4 −5 Source/SourceKittenFramework/Array+SourceKitten.swift
+2 −2 Source/SourceKittenFramework/ClangTranslationUnit.swift
+29 −30 Source/SourceKittenFramework/File.swift
+1 −1 Source/SourceKittenFramework/Info.plist
+1 −1 Source/SourceKittenFramework/Language.swift
+1 −1 Source/SourceKittenFramework/Module.swift
+3 −4 Source/SourceKittenFramework/OffsetMap.swift
+0 −15 Source/SourceKittenFramework/Optional+SourceKitten.swift
+1 −2 Source/SourceKittenFramework/Request.swift
+0 −387 Source/SourceKittenFramework/SWXMLHash.swift
+1 −0 Source/SourceKittenFramework/SourceKittenFramework.h
+12 −12 Source/SourceKittenFramework/String+SourceKitten.swift
+3 −3 Source/SourceKittenFramework/Structure.swift
+1 −1 Source/SourceKittenFramework/SwiftDocKey.swift
+1 −1 Source/SourceKittenFramework/SwiftDocs.swift
+5 −4 Source/SourceKittenFramework/SwiftXPC+JSON.swift
+1 −1 Source/SourceKittenFramework/SyntaxKind.swift
+7 −11 Source/SourceKittenFramework/SyntaxMap.swift
+68 −69 Source/SourceKittenFrameworkTests/Fixtures/Bicycle.json
+3,167 −0 Source/SourceKittenFrameworkTests/Fixtures/Commandant.json
+2 −1 Source/SourceKittenFrameworkTests/Fixtures/Subscript.json
+21 −11 Source/SourceKittenFrameworkTests/ModuleTests.swift
+3 −3 Source/SourceKittenFrameworkTests/OffsetMapTests.swift
+6 −2 Source/SourceKittenFrameworkTests/StructureTests.swift
+1 −1 Source/SourceKittenFrameworkTests/SwiftDocsTests.swift
+2 −2 Source/SourceKittenFrameworkTests/SyntaxTests.swift
+6 −0 Source/sourcekitten/Components.plist
+18 −23 Source/sourcekitten/Doc.swift
+14 −29 Source/sourcekitten/Errors.swift
+1 −1 Source/sourcekitten/Info.plist
+0 −63 Source/sourcekitten/Module+MultiProcess.swift
+11 −9 Source/sourcekitten/Structure.swift
+9 −9 Source/sourcekitten/Syntax.swift
+4 −4 Source/sourcekitten/Version.swift
+3 −4 Source/sourcekitten/main.swift
+3 −0 SourceKitten.xcworkspace/contents.xcworkspacedata
+2 −2 jazzy.sh
+25 −23 sourcekitten.xcodeproj/project.pbxproj
+1 −1 sourcekitten.xcodeproj/xcshareddata/xcschemes/SourceKittenFramework.xcscheme
+5 −3 sourcekitten.xcodeproj/xcshareddata/xcschemes/sourcekitten.xcscheme
1 change: 0 additions & 1 deletion lib/jazzy/SourceKitten/Commandant.framework/Modules
View file

This file was deleted.

Binary file modified lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Commandant
View file
Binary file not shown.
Binary file removed ...urceKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftdoc
View file
Binary file not shown.
Binary file removed ...eKitten/Commandant.framework/Versions/A/Modules/Commandant.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions lib/jazzy/SourceKitten/Commandant.framework/Versions/A/Modules/module.modulemap
View file

This file was deleted.

10 changes: 5 additions & 5 deletions lib/jazzy/SourceKitten/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>14C1514</string>
<string>14D136</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A383</string>
<string>14D125</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0620</string>
<string>0631</string>
<key>DTXcodeBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Carthage. All rights reserved.</string>
</dict>
Expand Down
1 change: 0 additions & 1 deletion lib/jazzy/SourceKitten/LlamaKit.framework/Modules
View file

This file was deleted.

Binary file modified lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/LlamaKit
View file
Binary file not shown.
Binary file removed ...y/SourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftdoc
View file
Binary file not shown.
Binary file removed ...ourceKitten/LlamaKit.framework/Versions/A/Modules/LlamaKit.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions lib/jazzy/SourceKitten/LlamaKit.framework/Versions/A/Modules/module.modulemap
View file

This file was deleted.

10 changes: 5 additions & 5 deletions lib/jazzy/SourceKitten/LlamaKit.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>14C1514</string>
<string>14D136</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -25,17 +25,17 @@
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A383</string>
<string>14D125</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0620</string>
<string>0631</string>
<key>DTXcodeBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Rob Napier. All rights reserved.</string>
<key>UIDeviceFamily</key>
Expand Down
1 change: 0 additions & 1 deletion lib/jazzy/SourceKitten/SourceKittenFramework.framework/Modules
View file

This file was deleted.

1 change: 1 addition & 0 deletions ...itten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Resources
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Versions/Current/Resources
1 change: 1 addition & 0 deletions ...itten/SourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/SWXMLHash
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Versions/Current/SWXMLHash
45 changes: 45 additions & 0 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
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>14D136</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>SWXMLHash</string>
<key>CFBundleIdentifier</key>
<string>drmohundro.SWXMLHash</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>SWXMLHash</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6D1002</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14D125</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0631</string>
<key>DTXcodeBuild</key>
<string>6D1002</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
</dict>
</plist>
Binary file added ...eKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/A/SWXMLHash
View file
Binary file not shown.
1 change: 1 addition & 0 deletions ...ourceKittenFramework.framework/Versions/A/Frameworks/SWXMLHash.framework/Versions/Current
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
A
1 change: 0 additions & 1 deletion ...ceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Modules
View file

This file was deleted.

Binary file removed ...s/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftdoc
View file
Binary file not shown.
Binary file removed .../Frameworks/SwiftXPC.framework/Versions/A/Modules/SwiftXPC.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions ...rk.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/Modules/module.modulemap
View file

This file was deleted.

12 changes: 6 additions & 6 deletions ...mework.framework/Versions/A/Frameworks/SwiftXPC.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>14C1514</string>
<string>14D136</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,25 +17,25 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.0.1</string>
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A383</string>
<string>14D125</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0620</string>
<string>0631</string>
<key>DTXcodeBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 JP Simard. All rights reserved.</string>
</dict>
Expand Down
Binary file modified ...rceKittenFramework.framework/Versions/A/Frameworks/SwiftXPC.framework/Versions/A/SwiftXPC
View file
Binary file not shown.
Binary file modified ...zzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCore.dylib
View file
Binary file not shown.
Binary file modified ...ceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftCoreGraphics.dylib
View file
Binary file not shown.
Binary file modified ...y/SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDarwin.dylib
View file
Binary file not shown.
Binary file modified ...SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftDispatch.dylib
View file
Binary file not shown.
Binary file modified ...urceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftFoundation.dylib
View file
Binary file not shown.
Binary file modified ...urceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib
View file
Binary file not shown.
Binary file modified ...SourceKitten/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftSecurity.dylib
View file
Binary file not shown.
Binary file removed ...nFramework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftdoc
View file
Binary file not shown.
Binary file removed ...amework.framework/Versions/A/Modules/SourceKittenFramework.swiftmodule/x86_64.swiftmodule
View file
Binary file not shown.
10 changes: 0 additions & 10 deletions lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/Modules/module.modulemap
View file

This file was deleted.

12 changes: 6 additions & 6 deletions lib/jazzy/SourceKitten/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>14C1514</string>
<string>14D136</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,25 +17,25 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.3.0</string>
<string>0.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14A383</string>
<string>14D125</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<key>DTXcode</key>
<string>0620</string>
<string>0631</string>
<key>DTXcodeBuild</key>
<string>6C131e</string>
<string>6D1002</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2015 SourceKitten. All rights reserved.</string>
</dict>
Expand Down
Binary file modified lib/jazzy/SourceKitten/SourceKittenFramework.framework/Versions/A/SourceKittenFramework
View file
Binary file not shown.
Binary file modified lib/jazzy/SourceKitten/sourcekitten
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions lib/jazzy/config.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/jazzy/gem_version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Jazzy
VERSION = '0.1.6' unless defined? Jazzy::VERSION
VERSION = '0.2.0' unless defined? Jazzy::VERSION
end
Loading

0 comments on commit e7e01f9

Please sign in to comment.