Refactor Compass with sugar

.gitignore

@@ -28,3 +28,9 @@ DerivedData
 
 # CocoaPods
 Pods
+
+# Carthage
+Carthage
+
+# SPM
+.build/

.travis.yml

@@ -1,11 +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: 
+script:
 - xctool clean build -project Compass.xcodeproj -scheme Compass-iOS -sdk iphonesimulator
-- xctool test -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

Cartfile

@@ -0,0 +1 @@
+github "hyperoslo/Sugar"

Cartfile.resolved

@@ -0,0 +1 @@
+github "hyperoslo/Sugar" "1.0.2"

Compass.podspec

@@ -1,13 +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.platform     = :ios, '8.0'
+
+  s.ios.deployment_target = '8.0'
+  s.osx.deployment_target = '10.9'
+
   s.requires_arc = true
-  s.source_files = 'Source/**/*'
+  s.ios.source_files = 'Sources/{iOS,Shared}/**/*'
+  s.osx.source_files = 'Sources/{Mac,Shared}/**/*'
+
+  # s.ios.frameworks = 'UIKit', 'Foundation'
+  # s.osx.frameworks = 'Cocoa', 'Foundation'
+
+  # s.dependency 'Whisper', '~> 1.0'
 end

Compass.xcodeproj/xcshareddata/xcschemes/Compass-Mac.xcscheme

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
+               BuildableName = "Compass.framework"
+               BlueprintName = "Compass-Mac"
+               ReferencedContainer = "container:Compass.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D5C629481C3A7FAA007F7B7C"
+               BuildableName = "Compass-Mac-Tests.xctest"
+               BlueprintName = "Compass-Mac-Tests"
+               ReferencedContainer = "container:Compass.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
+            BuildableName = "Compass.framework"
+            BlueprintName = "Compass-Mac"
+            ReferencedContainer = "container:Compass.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
+            BuildableName = "Compass.framework"
+            BlueprintName = "Compass-Mac"
+            ReferencedContainer = "container:Compass.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D5C6293F1C3A7FAA007F7B7C"
+            BuildableName = "Compass.framework"
+            BlueprintName = "Compass-Mac"
+            ReferencedContainer = "container:Compass.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Compass.xcodeproj/xcshareddata/xcschemes/Compass-iOS.xcscheme

@@ -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-iOS-Tests.xctest"
-               BlueprintName = "Compass-iOS-Tests"
-               ReferencedContainer = "container:Compass.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -46,7 +32,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "D5DC59621C200D55003BD79B"
+               BlueprintIdentifier = "D5B2E8A81C3A780C00C0327D"
                BuildableName = "Compass-iOS-Tests.xctest"
                BlueprintName = "Compass-iOS-Tests"
                ReferencedContainer = "container:Compass.xcodeproj">
@@ -56,7 +42,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D5DC59581C200D55003BD79B"
+            BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
             BuildableName = "Compass.framework"
             BlueprintName = "Compass-iOS"
             ReferencedContainer = "container:Compass.xcodeproj">
@@ -78,7 +64,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D5DC59581C200D55003BD79B"
+            BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
             BuildableName = "Compass.framework"
             BlueprintName = "Compass-iOS"
             ReferencedContainer = "container:Compass.xcodeproj">
@@ -96,7 +82,7 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "D5DC59581C200D55003BD79B"
+            BlueprintIdentifier = "D5B2E89E1C3A780C00C0327D"
             BuildableName = "Compass.framework"
             BlueprintName = "Compass-iOS"
             ReferencedContainer = "container:Compass.xcodeproj">

Compass/Info-Mac.plist

@@ -0,0 +1,28 @@
+<?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>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2016 Hyper Interaktiv AS. All rights reserved.</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>

CompassTests/Info-iOS.plist

@@ -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>

Tests/TestCompass.swift → CompassTests/Shared/TestCompass.swift

@@ -1,4 +1,4 @@
-import UIKit
+import Foundation
 import XCTest
 import Compass