Skip to content

Commit

Permalink
Create branch for Swift 3 Xcode 8
Browse files Browse the repository at this point in the history
  • Loading branch information
joelparkerhenderson committed Sep 22, 2017
1 parent 57d9adb commit 58ce8e9
Show file tree
Hide file tree
Showing 64 changed files with 2,623 additions and 1,007 deletions.
14 changes: 7 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
##

## Builds
.build/
.Build/
build/
Build/
DerivedData/
#.build/
#.Build/
#build/
#Build/
#DerivedData/

## Settings
*.pbxuser
Expand Down Expand Up @@ -46,8 +46,8 @@ Package.resolved
Pods/

## Carthage
*/Carthage/Checkouts
*/Carthage/Buildg
#*/Carthage/Checkouts
#*/Carthage/Buildg

## Fastlane
fastlane/report.xml
Expand Down
2 changes: 1 addition & 1 deletion Demo Swift Carthage/Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "robrix/Prelude" "2.0.0"
github "robrix/Prelude" "3.0.0"
21 changes: 21 additions & 0 deletions Demo Swift Carthage/Carthage/Build/.Prelude.version

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

This file was deleted.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Demo Swift Carthage/Carthage/Build/iOS/Prelude.framework/Prelude
Binary file not shown.
7 changes: 7 additions & 0 deletions Demo Swift Carthage/Carthage/Checkouts/Prelude/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.DS_Store
build
xcuserdata
*.mode*
*.pbxuser
*.xcuserdatad
*.xccheckout
21 changes: 21 additions & 0 deletions Demo Swift Carthage/Carthage/Checkouts/Prelude/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Rob Rix

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
13 changes: 13 additions & 0 deletions Demo Swift Carthage/Carthage/Checkouts/Prelude/Prelude.podspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Pod::Spec.new do |spec|
spec.name = 'Prelude'
spec.version = '3.0.0'
spec.license = { :type => 'MIT', :file => 'LICENSE' }
spec.homepage = 'https://github.com/robrix/Prelude'
spec.authors = { 'Rob Rix' => 'rob.rix@github.com' }
spec.summary = 'Swift µframework of simple functional programming tools'
spec.source = { :git => 'https://github.com/robrix/Prelude.git', :tag => spec.version.to_s }
spec.source_files = 'Prelude/*.swift'
spec.requires_arc = true
spec.ios.deployment_target = "8.0"
spec.osx.deployment_target = "10.9"
end

0 comments on commit 58ce8e9

Please sign in to comment.