Skip to content

Commit

Permalink
Refactor with carthage
Browse files Browse the repository at this point in the history
  • Loading branch information
Christoffer Winterkvist committed Jan 8, 2016
1 parent d134294 commit 3c6a75e
Show file tree
Hide file tree
Showing 32 changed files with 453 additions and 1,295 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,9 @@ DerivedData

# CocoaPods
Pods

# Carthage
Carthage

# SPM
.build/
13 changes: 7 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
osx_image: xcode7.2
language: objective-c
cache: cocoapods

before_install:
before_install:
- brew update
- brew install carthage
- if brew outdated | grep -qx xctool; then brew upgrade xctool; fi
- carthage update --platform iOS,Mac

script:
- xctool clean build -workspace Compass.xcworkspace -scheme Compass-iOS -sdk iphonesimulator
- xctool test -workspace Compass.xcworkspace -scheme Compass-iOS -sdk iphonesimulator
- xctool clean build -workspace Compass.xcworkspace -scheme Compass-Mac -sdk macosx
- xctool test -workspace Compass.xcworkspace -scheme Compass-Mac -sdk macosx
- xctool clean build -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
- xctool test -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
- xctool clean build -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
- xctool test -project Compass.xcodeproj -scheme Compass-Mac -sdk macosx
1 change: 1 addition & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "hyperoslo/Sugar" "1.0.2"
18 changes: 12 additions & 6 deletions Compass.podspec
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
Pod::Spec.new do |s|
s.name = "Compass"
s.summary = "Compass helps you setup a central navigation system for your iOS application."
s.version = "1.2.4"
s.summary = "A short description of Compass."
s.version = "0.1.0"
s.homepage = "https://github.com/hyperoslo/Compass"
s.license = 'MIT'
s.author = { "Hyper Interaktiv AS" => "ios@hyper.no" }
s.source = { :git => "https://github.com/hyperoslo/Compass.git", :tag => s.version.to_s }
s.source = {
:git => "https://github.com/hyperoslo/Compass.git",
:tag => s.version.to_s
}
s.social_media_url = 'https://twitter.com/hyperoslo'

s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'

s.requires_arc = true
s.ios.source_files = 'Sources/{iOS,Shared}/**/*'
s.osx.source_files = 'Sources/{Mac,Shared}/**/*'

s.ios.source_files = 'Source/**/*'
s.osx.source_files = 'Source/**/*'
s.dependency 'Sugar'
# s.ios.frameworks = 'UIKit', 'Foundation'
# s.osx.frameworks = 'Cocoa', 'Foundation'

# s.dependency 'Whisper', '~> 1.0'
end
736 changes: 378 additions & 358 deletions Compass.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

28 changes: 7 additions & 21 deletions Compass.xcodeproj/xcshareddata/xcschemes/Compass-Mac.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,12 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDB693161C3EA91B00A5FB86"
BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
BuildableName = "Compass.framework"
BlueprintName = "Compass-Mac"
ReferencedContainer = "container:Compass.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59621C200D55003BD79B"
BuildableName = "Compass-Tests.xctest"
BlueprintName = "Compass-Tests"
ReferencedContainer = "container:Compass.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand All @@ -46,17 +32,17 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59621C200D55003BD79B"
BuildableName = "Compass-Tests.xctest"
BlueprintName = "Compass-Tests"
BlueprintIdentifier = "D5C629481C3A7FAA007F7B7C"
BuildableName = "Compass-Mac-Tests.xctest"
BlueprintName = "Compass-Mac-Tests"
ReferencedContainer = "container:Compass.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDB693161C3EA91B00A5FB86"
BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
BuildableName = "Compass.framework"
BlueprintName = "Compass-Mac"
ReferencedContainer = "container:Compass.xcodeproj">
Expand All @@ -78,7 +64,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDB693161C3EA91B00A5FB86"
BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
BuildableName = "Compass.framework"
BlueprintName = "Compass-Mac"
ReferencedContainer = "container:Compass.xcodeproj">
Expand All @@ -96,7 +82,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "BDB693161C3EA91B00A5FB86"
BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
BuildableName = "Compass.framework"
BlueprintName = "Compass-Mac"
ReferencedContainer = "container:Compass.xcodeproj">
Expand Down
28 changes: 7 additions & 21 deletions Compass.xcodeproj/xcshareddata/xcschemes/Compass-iOS.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,12 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
BuildableName = "Compass.framework"
BlueprintName = "Compass-iOS"
ReferencedContainer = "container:Compass.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "NO"
buildForProfiling = "NO"
buildForArchiving = "NO"
buildForAnalyzing = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59621C200D55003BD79B"
BuildableName = "Compass-Tests.xctest"
BlueprintName = "Compass-Tests"
ReferencedContainer = "container:Compass.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
Expand All @@ -46,17 +32,17 @@
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59621C200D55003BD79B"
BuildableName = "Compass-Tests.xctest"
BlueprintName = "Compass-Tests"
BlueprintIdentifier = "D5B2E8A81C3A780C00C0327D"
BuildableName = "Compass-iOS-Tests.xctest"
BlueprintName = "Compass-iOS-Tests"
ReferencedContainer = "container:Compass.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
BuildableName = "Compass.framework"
BlueprintName = "Compass-iOS"
ReferencedContainer = "container:Compass.xcodeproj">
Expand All @@ -78,7 +64,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
BuildableName = "Compass.framework"
BlueprintName = "Compass-iOS"
ReferencedContainer = "container:Compass.xcodeproj">
Expand All @@ -96,7 +82,7 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D5DC59581C200D55003BD79B"
BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
BuildableName = "Compass.framework"
BlueprintName = "Compass-iOS"
ReferencedContainer = "container:Compass.xcodeproj">
Expand Down
10 changes: 0 additions & 10 deletions Compass.xcworkspace/contents.xcworkspacedata

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
24 changes: 24 additions & 0 deletions CompassTests/Info-iOS.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<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>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>
File renamed without changes.
Loading

0 comments on commit 3c6a75e

Please sign in to comment.