Skip to content

Commit

Permalink
Merge branch 'release/3.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Florian Krüger committed Oct 31, 2016
2 parents 8a3755f + 1d9429f commit f5977b1
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 5 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Version 3.0.1

- [x] Swift 3.0.1 / Xcode 8.1 compatibility

## Version 3.0.0

- [x] Swift 3 compatibility
Expand Down
2 changes: 1 addition & 1 deletion Manuscript-Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<string>3.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Manuscript.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Manuscript"
s.version = "3.0.0"
s.version = "3.0.1"
s.summary = "AutoLayoutKit in pure Swift."
s.description = <<-DESC
It's like AutoLayoutKit but written in Swift. For pure Swift projects. And it's super simple.
Expand Down
13 changes: 13 additions & 0 deletions Manuscript.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,13 @@
remoteGlobalIDString = DF1CDF641CF093040006B594;
remoteInfo = "Manuscript-tvOS";
};
DFF1EE3B1DC72CC8005ADB25 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = DF1CDF4C1CF092C60006B594 /* Project object */;
proxyType = 1;
remoteGlobalIDString = DF1CDF561CF092E70006B594;
remoteInfo = "Manuscript-iOS";
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
Expand Down Expand Up @@ -305,6 +312,7 @@
buildRules = (
);
dependencies = (
DFF1EE3C1DC72CC8005ADB25 /* PBXTargetDependency */,
);
name = "Manuscript-Example";
productName = "Manuscript-Example";
Expand Down Expand Up @@ -505,6 +513,11 @@
target = DF1CDF641CF093040006B594 /* Manuscript-tvOS */;
targetProxy = DF1CDFE61CF095FA0006B594 /* PBXContainerItemProxy */;
};
DFF1EE3C1DC72CC8005ADB25 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DF1CDF561CF092E70006B594 /* Manuscript-iOS */;
targetProxy = DFF1EE3B1DC72CC8005ADB25 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

/* Begin XCBuildConfiguration section */
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[![GitHub release](https://img.shields.io/github/release/floriankrueger/Manuscript.svg)](https://github.com/floriankrueger/Manuscript)
[![CircleCI](https://img.shields.io/circleci/project/floriankrueger/Manuscript.svg)](https://circleci.com/gh/floriankrueger/Manuscript)
[![Coveralls branch](https://img.shields.io/coveralls/floriankrueger/manuscript.svg)](https://coveralls.io/r/floriankrueger/Manuscript)
[![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
[![CocoaPods](https://img.shields.io/cocoapods/v/Manuscript.svg)](https://github.com/floriankrueger/Manuscript)
[![Swift](https://img.shields.io/badge/Swift-3.0-orange.svg)](https://swift.org)
Expand Down Expand Up @@ -191,6 +190,13 @@ If you need to support Swift 2.3 then please use the last compatible version 2.1
github "floriankrueger/Manuscript" == 2.1.0
```

If your Swift 3 compiler isn't compatible with the framework binary from the github release then
please use the following command to build Manuscript yourself:

```
carthage bootstrap Manuscript --no-use-binaries
```

### CocoaPods

Make sure your `Podfile` contains all of the following lines.
Expand Down
2 changes: 1 addition & 1 deletion Sources/Info-iOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<string>3.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion Sources/Info-tvOS.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>3.0.0</string>
<string>3.0.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down

0 comments on commit f5977b1

Please sign in to comment.