Skip to content
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.

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

Carthage support #28

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 27 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# Xcode
# Mac OS X
.DS_Store

# Xcode

## Build generated
build/
DerivedData

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -9,12 +16,24 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile

## Other
*.xccheckout
*.moved-aside
DerivedData
.idea/
Pods
Tests/RKValueTransformersTests.xcodeproj/xcshareddata/xcschemes/
*.xcuserstate
*.xcscmblueprint

## Obj-C/Swift specific
*.hmap
*.ipa

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
.build/

# Carthage
Carthage/Build
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "Carthage/Checkouts/expecta"]
path = Carthage/Checkouts/expecta
url = https://github.com/specta/expecta.git
37 changes: 31 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,32 @@
language: objective-c
rvm:
- 2.1.3
install:
- bundle install
- bundle exec pod install
script: bundle exec rake test
osx_image: xcode8.2
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- WORKSPACE=RKValueTransformers.xcworkspace
- IOS_FRAMEWORK_SCHEME="RKValueTransformers iOS"
- MACOS_FRAMEWORK_SCHEME="RKValueTransformers macOS"
matrix:
- DESTINATION="OS=10.0,name=iPhone 6s Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
- DESTINATION="OS=9.0,name=iPad 2" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"

- DESTINATION="arch=x86_64" SCHEME="$MACOS_FRAMEWORK_SCHEME" RUN_TESTS="YES"
script:
- set -o pipefail
- git submodule update --init
- xcodebuild -version

# Build Framework in Debug and Run Tests if specified
- if [ $RUN_TESTS == "YES" ]; then
travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test;
else
travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build;
fi

# Build Framework in Release and Run Tests if specified
- if [ $RUN_TESTS == "YES" ]; then
travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO ENABLE_TESTABILITY=YES test;
else
travis_retry xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build;
fi
1 change: 1 addition & 0 deletions Cartfile.private
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "specta/expecta" "master"
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "specta/expecta" "7f270dd634f0bade3a2d9fb4faf4f17cd5e70e18"
1 change: 1 addition & 0 deletions Carthage/Checkouts/expecta
Submodule expecta added at 7f270d
14 changes: 8 additions & 6 deletions Tests/OS X Tests-Info.plist → Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>org.restkit.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>BNDL</string>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>NSPrincipalClass</key>
<string></string>
</dict>
</plist>
22 changes: 0 additions & 22 deletions Podfile

This file was deleted.

4 changes: 3 additions & 1 deletion Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ SPEC CHECKSUMS:
Expecta: a354d4633409dd9fe8c4f5ff5130426adbe31628
RKValueTransformers: e5ed67e3811229b616fe01bddeeafe3bb337b1b9

COCOAPODS: 0.39.0
PODFILE CHECKSUM: 9d0c9d120203139070f30c68d6d86f7381143c5e

COCOAPODS: 1.2.0
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ RKValueTransformers
===================

[![Build Status](http://img.shields.io/travis/RestKit/RKValueTransformers/master.svg?style=flat)](https://travis-ci.org/RestKit/RKValueTransformers)
[![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
![Pod Version](http://cocoapod-badges.herokuapp.com/v/RKValueTransformers/badge.png)
![Pod Platform](http://cocoapod-badges.herokuapp.com/p/RKValueTransformers/badge.png)

Expand Down
4 changes: 2 additions & 2 deletions RKValueTransformers.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'RKValueTransformers'
s.version = '1.1.3'
s.version = '1.1.5'
s.license = 'Apache2'
s.summary = 'A powerful value transformation API extracted from RestKit.'
s.homepage = 'https://github.com/RestKit/RKValueTransformers'
Expand All @@ -9,6 +9,6 @@ Pod::Spec.new do |s|
s.source_files = 'Code'
s.requires_arc = true

s.ios.deployment_target = '5.1.1'
s.ios.deployment_target = '6.0'
s.osx.deployment_target = '10.7'
end
Loading