Skip to content

catch up #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mirekp merged 4 commits into from
Sep 10, 2016
Merged

catch up #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0580f11
Merge pull request #2 from mirekp/master
beatrichartz Sep 10, 2016
8b9a95e
Use XCode 8 for Travis builds
beatrichartz Sep 10, 2016
0c59ba0
Version bump
beatrichartz Sep 10, 2016
a2c1622
Upgrade device build targets for travis
beatrichartz Sep 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.3
osx_image: xcode8
xcode_project: Mixer.xcodeproj

branches:
Expand Down Expand Up @@ -32,6 +32,18 @@ env:
- DESTINATION="OS=9.3,name=iPhone 6s"
- DESTINATION="OS=9.3,name=iPhone 6 Plus"
- DESTINATION="OS=9.3,name=iPhone 6s Plus"
- DESTINATION="OS=10.0,name=iPad Air"
- DESTINATION="OS=10.0,name=iPad Air 2"
- DESTINATION="OS=10.0,name=iPad Retina"
- DESTINATION="OS=10.0,name=iPhone 5"
- DESTINATION="OS=10.0,name=iPhone 5s"
- DESTINATION="OS=10.0,name=iPhone 6"
- DESTINATION="OS=10.0,name=iPhone 6s"
- DESTINATION="OS=10.0,name=iPhone 6 Plus"
- DESTINATION="OS=10.0,name=iPhone 6s Plus"
- DESTINATION="OS=10.0,name=iPhone 6SE"
- DESTINATION="OS=10.0,name=iPhone 7"
- DESTINATION="OS=10.0,name=iPhone 7 Plus"

before_script:
- carthage update --platform iOS --no-use-binaries
Expand Down
2 changes: 1 addition & 1 deletion Mixer.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Mixer"
s.version = "0.1.1"
s.version = "0.1.2"
s.summary = "A tiny library helping to centralize color definitions"
s.homepage = "https://github.com/ios-studio/Mixer"
s.license = { :type => "MIT", :file => "LICENSE" }
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ Centralize your color definitions in a CSV file & easily share them for people t
Add the following your Cartfile:

```Swift
github "ios-studio/Mixer" ~> 0.1.1
github "ios-studio/Mixer" ~> 0.1.2
```

#### Via [CocoaPods](https://cocoapods.org/):
Add the following your Podfile:

```ruby
pod "Mixer", "~> 0.1.1"
pod "Mixer", "~> 0.1.2"
```

## Default Setup
Expand Down