Skip to content

Commit

Permalink
update SourceKitten, Realm, Alamofire & fix rubocop issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpsim
jpsim committed Aug 26, 2015
1 parent 7ddaecd commit 672fee6
Show file tree
Hide file tree
Showing 27 changed files with 66 additions and 48 deletions.
2 changes: 1 addition & 1 deletion SourceKitten
Submodule SourceKitten updated 66 files
+28 −2 .gitignore
+3 −3 .gitmodules
+1 −1 .travis.yml
+16 −0 CHANGELOG.md
+2 −2 Cartfile
+1 −1 Cartfile.private
+5 −5 Cartfile.resolved
+1 −1 Carthage/Checkouts/Commandant
+0 −1 Carthage/Checkouts/LlamaKit
+1 −0 Carthage/Checkouts/Result
+1 −1 Carthage/Checkouts/SWXMLHash
+1 −1 Carthage/Checkouts/SwiftXPC
+1 −1 Carthage/Checkouts/xcconfigs
+14 −2 README.md
+2 −2 Source/SourceKittenFramework/Array+SourceKitten.swift
+16 −46 Source/SourceKittenFramework/ClangTranslationUnit.swift
+4 −4 Source/SourceKittenFramework/Dictionary+Merge.swift
+66 −117 Source/SourceKittenFramework/File.swift
+2 −2 Source/SourceKittenFramework/Info.plist
+0 −90 Source/SourceKittenFramework/Language.swift
+21 −71 Source/SourceKittenFramework/Module.swift
+22 −21 Source/SourceKittenFramework/OffsetMap.swift
+21 −23 Source/SourceKittenFramework/Request.swift
+0 −22 Source/SourceKittenFramework/SequenceType+SourceKitten.swift
+65 −0 Source/SourceKittenFramework/SourceDeclaration.swift
+2 −0 Source/SourceKittenFramework/SourceKittenFramework.h
+79 −74 Source/SourceKittenFramework/String+SourceKitten.swift
+7 −7 Source/SourceKittenFramework/Structure.swift
+5 −1 Source/SourceKittenFramework/SwiftDeclarationKind.swift
+42 −75 Source/SourceKittenFramework/SwiftDocKey.swift
+10 −8 Source/SourceKittenFramework/SwiftDocs.swift
+15 −33 Source/SourceKittenFramework/SwiftXPC+JSON.swift
+8 −2 Source/SourceKittenFramework/SyntaxKind.swift
+21 −18 Source/SourceKittenFramework/SyntaxMap.swift
+8 −8 Source/SourceKittenFramework/SyntaxToken.swift
+166 −0 Source/SourceKittenFramework/Xcode.swift
+10 −2 Source/SourceKittenFramework/clang-c/BuildSystem.h
+87 −13 Source/SourceKittenFramework/clang-c/Index.h
+38 −0 Source/SourceKittenFramework/clang-c/Makefile
+4 −0 Source/SourceKittenFramework/clang-c/module.modulemap
+1 −1 Source/SourceKittenFramework/sourcekitd.swift
+1 −1 Source/SourceKittenFrameworkTests/ClangTranslationUnitTests.swift
+16 −0 Source/SourceKittenFrameworkTests/FileTests.swift
+275 −100 Source/SourceKittenFrameworkTests/Fixtures/Bicycle.json
+25 −25 Source/SourceKittenFrameworkTests/Fixtures/Bicycle.swift
+996 −816 Source/SourceKittenFrameworkTests/Fixtures/Commandant.json
+1 −1 Source/SourceKittenFrameworkTests/Info.plist
+19 −27 Source/SourceKittenFrameworkTests/ModuleTests.swift
+6 −3 Source/SourceKittenFrameworkTests/OffsetMapTests.swift
+109 −0 Source/SourceKittenFrameworkTests/SourceKitTests.swift
+29 −48 Source/SourceKittenFrameworkTests/StringTests.swift
+31 −21 Source/SourceKittenFrameworkTests/StructureTests.swift
+1 −1 Source/SourceKittenFrameworkTests/SwiftDocsTests.swift
+3 −3 Source/SourceKittenFrameworkTests/SyntaxTests.swift
+1 −1 Source/sourcekitten/Components.plist
+21 −22 Source/sourcekitten/DocCommand.swift
+2 −7 Source/sourcekitten/Errors.swift
+2 −2 Source/sourcekitten/Info.plist
+10 −11 Source/sourcekitten/StructureCommand.swift
+8 −12 Source/sourcekitten/SyntaxCommand.swift
+5 −6 Source/sourcekitten/VersionCommand.swift
+2 −2 SourceKitten.xcworkspace/contents.xcworkspacedata
+2 −2 jazzy.sh
+58 −27 sourcekitten.xcodeproj/project.pbxproj
+8 −4 sourcekitten.xcodeproj/xcshareddata/xcschemes/SourceKittenFramework.xcscheme
+8 −5 sourcekitten.xcodeproj/xcshareddata/xcschemes/sourcekitten.xcscheme
Binary file modified ...ittenFramework.framework/Versions/A/Frameworks/Commandant.framework/Versions/A/Commandant
View file
Binary file not shown.
16 changes: 10 additions & 6 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>15A235d</string>
<string>15A263e</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -20,22 +20,26 @@
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6E35b</string>
<string>7A192o</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14D125</string>
<string>15A244e</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0640</string>
<string>0700</string>
<key>DTXcodeBuild</key>
<string>6E35b</string>
<string>7A192o</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Carthage. All rights reserved.</string>
</dict>
Expand Down
1 change: 0 additions & 1 deletion ...meworks/SourceKittenFramework.framework/Versions/A/Frameworks/LlamaKit.framework/LlamaKit
View file

This file was deleted.

Binary file removed ...rceKittenFramework.framework/Versions/A/Frameworks/LlamaKit.framework/Versions/A/LlamaKit
View file
Binary file not shown.
0 ...A/Frameworks/LlamaKit.framework/Resources → ...s/A/Frameworks/Result.framework/Resources
View file
File renamed without changes.
1 change: 1 addition & 0 deletions .../Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/Result.framework/Result
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Versions/Current/Result
31 changes: 15 additions & 16 deletions ...framework/Versions/A/Resources/Info.plist → ...framework/Versions/A/Resources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,44 @@
<plist version="1.0">
<dict>
<key>BuildMachineOSBuild</key>
<string>15A235d</string>
<string>15A263e</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>LlamaKit</string>
<string>Result</string>
<key>CFBundleIdentifier</key>
<string>net.robnapier.LlamaKit</string>
<string>com.antitypical.Result</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>LlamaKit</string>
<string>Result</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>0.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6E35b</string>
<string>7A192o</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14D125</string>
<string>15A244e</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0640</string>
<string>0700</string>
<key>DTXcodeBuild</key>
<string>6E35b</string>
<string>7A192o</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2014 Rob Napier. All rights reserved.</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<string>Copyright © 2015 Rob Rix. All rights reserved.</string>
</dict>
</plist>
Binary file added .../SourceKittenFramework.framework/Versions/A/Frameworks/Result.framework/Versions/A/Result
View file
Binary file not shown.
0 ...works/LlamaKit.framework/Versions/Current → ...meworks/Result.framework/Versions/Current
View file
File renamed without changes.
16 changes: 10 additions & 6 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>15A235d</string>
<string>15A263e</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -20,22 +20,26 @@
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6E35b</string>
<string>7A192o</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14D125</string>
<string>15A244e</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0640</string>
<string>0700</string>
<key>DTXcodeBuild</key>
<string>6E35b</string>
<string>7A192o</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.
16 changes: 10 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>15A235d</string>
<string>15A263e</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -20,22 +20,26 @@
<string>1.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6E35b</string>
<string>7A192o</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14D125</string>
<string>15A244e</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0640</string>
<string>0700</string>
<key>DTXcodeBuild</key>
<string>6E35b</string>
<string>7A192o</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 ...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 modified ...Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftObjectiveC.dylib
View file
Binary file not shown.
Binary file removed ...n/Frameworks/SourceKittenFramework.framework/Versions/A/Frameworks/libswiftSecurity.dylib
View file
Binary file not shown.
18 changes: 11 additions & 7 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>15A235d</string>
<string>15A263e</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
Expand All @@ -17,25 +17,29 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.4.4</string>
<string>0.4.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>
</array>
<key>CFBundleVersion</key>
<string>1</string>
<key>DTCompiler</key>
<string>com.apple.compilers.llvm.clang.1_0</string>
<key>DTPlatformBuild</key>
<string>6E35b</string>
<string>7A192o</string>
<key>DTPlatformVersion</key>
<string>GM</string>
<key>DTSDKBuild</key>
<string>14D125</string>
<string>15A244e</string>
<key>DTSDKName</key>
<string>macosx10.10</string>
<string>macosx10.11</string>
<key>DTXcode</key>
<string>0640</string>
<string>0700</string>
<key>DTXcodeBuild</key>
<string>6E35b</string>
<string>7A192o</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.
9 changes: 6 additions & 3 deletions lib/jazzy/jazzy_markdown.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,19 @@ def header(text, header_level)
Version
Warning).freeze

# rubocop:disable RegexpLiteral
SPECIAL_LIST_TYPE_REGEX = %r{
\A\s* # optional leading spaces
(<p>\s*)? # optional opening p tag
(#{SPECIAL_LIST_TYPES.map(&Regexp.method(:escape)).join('|')}) # any one of our special list types
# any one of our special list types
(#{SPECIAL_LIST_TYPES.map(&Regexp.method(:escape)).join('|')})
[\s:] # followed by either a space or a colon
}ix
# rubocop:enable RegexpLiteral

ELIDED_LI_TOKEN = '7wNVzLB0OYPL2eGlPKu8q4vITltqh0Y6DPZf659TPMAeYh49oEc15B33bAo'.freeze
ELIDED_LI_TOKEN = '7wNVzLB0OYPL2eGlPKu8q4vITltqh0Y6DPZf659TPMAeYh49o'.freeze

def list_item(text, list_type)
def list_item(text, _list_type)
return ELIDED_LI_TOKEN if text =~ SPECIAL_LIST_TYPE_REGEX
str = '<li>'
str << text.strip
Expand Down
2 changes: 1 addition & 1 deletion spec/integration_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
'--root-url https://realm.io/docs/swift/' \
"#{realm_version}/api/ " \
'--xcodebuild-arguments ' \
'-project,RealmSwift.xcodeproj,-dry-run'
'-project,RealmSwift.xcodeproj,-dry-run ' \
'--template-directory "docs/templates/swift" '
end

Expand Down
2 changes: 1 addition & 1 deletion spec/integration_specs
Submodule integration_specs updated 154 files

0 comments on commit 672fee6

Please sign in to comment.