Merge pull request #1422 from danielgindi/workspacing

Update project structure for simplicity and fixing carthage
ChartsOrg · Sep 17, 2016 · a540403 · a540403
2 parents 58e50bf + 13834f9
commit a540403
Show file tree

Hide file tree

Showing 361 changed files with 1,719 additions and 23,013 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,6 @@
-osx_image: xcode7.3
+osx_image: xcode8
 language: objective-c
+rvm: "2.2.2"
 
 env:
   global:
@@ -10,10 +11,10 @@ cache:
 
 before_install:
   - brew update
-  - cd Charts && carthage bootstrap
+  - carthage bootstrap
 
 script:
-  - rake test
+  - bundle exec rake test
 
 # after_success:
 #   - bash <(curl -s https://codecov.io/bash)
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "realm/realm-cocoa" ~> 1.1
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1 @@
+github "facebook/ios-snapshot-test-case" "master"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "facebook/ios-snapshot-test-case" "da629211c17a4c507e2e866e8a19ed3122af770b"
+github "realm/realm-cocoa" "v1.1.0"
diff --git a/Carthage.xcconfig b/Carthage.xcconfig
@@ -0,0 +1,15 @@
+//
+//  Carthage.xcconfig
+//  Charts
+//
+//  Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
+//  A port of MPAndroidChart for iOS
+//  Licensed under Apache License 2.0
+//
+//  https://github.com/danielgindi/Charts
+//
+
+FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(SRCROOT)/Carthage/Build/Mac/ $(inherited)
+FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/Carthage/Build/iOS/ $(inherited)
+FRAMEWORK_SEARCH_PATHS[sdk=watch*] = $(SRCROOT)/Carthage/Build/watchOS/ $(inherited)
+FRAMEWORK_SEARCH_PATHS[sdk=appletv*] = $(SRCROOT)/Carthage/Build/tvOS/ $(inherited)
diff --git a/Charts.podspec b/Charts.podspec
@@ -10,15 +10,15 @@ Pod::Spec.new do |s|
   s.osx.deployment_target = "10.11"
   s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
   s.default_subspec = "Core"
-  s.prepare_command = "sed -i '' -e 's/import Charts//g' ChartsRealm/Classes/**/*.swift"
+  s.prepare_command = "sed -i '' -e 's/import Charts//g' Source/ChartsRealm/**/*.swift"
 
   s.subspec "Core" do |ss|
-    ss.source_files  = "Charts/Classes/**/*.swift"
+    ss.source_files  = "Source/Charts/**/*.swift"
   end
 
   s.subspec "Realm" do |ss|
-    ss.source_files  = "ChartsRealm/Classes/**/*.swift"
+    ss.source_files  = "Source/ChartsRealm/**/*.swift"
     ss.dependency "Charts/Core"
-    ss.dependency "RealmSwift", "~> 1.0.2"
+    ss.dependency "RealmSwift", "~> 1.1"
   end
 end
diff --git a/Charts.xcodeproj/project.pbxproj b/Charts.xcodeproj/project.pbxproj
diff --git a/...cshareddata/xcschemes/Charts-iOS.xcscheme → ...oj/xcshareddata/xcschemes/Charts.xcscheme b/...cshareddata/xcschemes/Charts-iOS.xcscheme → ...oj/xcshareddata/xcschemes/Charts.xcscheme
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
+               BlueprintIdentifier = "06165F231D8110E600722320"
                BuildableName = "Charts.framework"
-               BlueprintName = "Charts-iOS"
+               BlueprintName = "Charts"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,13 +26,14 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06AEE7A11BDC3F8B009875AE"
+               BlueprintIdentifier = "06165F2D1D8110E600722320"
                BuildableName = "ChartsTests.xctest"
                BlueprintName = "ChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
@@ -42,9 +43,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
+            BlueprintIdentifier = "06165F231D8110E600722320"
             BuildableName = "Charts.framework"
-            BlueprintName = "Charts-iOS"
+            BlueprintName = "Charts"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -64,16 +65,16 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
+            BlueprintIdentifier = "06165F231D8110E600722320"
             BuildableName = "Charts.framework"
-            BlueprintName = "Charts-iOS"
+            BlueprintName = "Charts"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages"
+            value = "$(SOURCE_ROOT)/Tests/Charts/ReferenceImages"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
@@ -89,9 +90,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
+            BlueprintIdentifier = "06165F231D8110E600722320"
             BuildableName = "Charts.framework"
-            BlueprintName = "Charts-iOS"
+            BlueprintName = "Charts"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...xcshareddata/xcschemes/Charts-TV.xcscheme → ...shareddata/xcschemes/ChartsRealm.xcscheme b/...xcshareddata/xcschemes/Charts-TV.xcscheme → ...shareddata/xcschemes/ChartsRealm.xcscheme
@@ -14,9 +14,9 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
-               BuildableName = "Charts.framework"
-               BlueprintName = "Charts-TV"
+               BlueprintIdentifier = "06B120D41D811E6200D14B02"
+               BuildableName = "ChartsRealm.framework"
+               BlueprintName = "ChartsRealm"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -26,9 +26,29 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "06B120FE1D811F1600D14B02"
+               BuildableName = "ChartsRealmTests.xctest"
+               BlueprintName = "ChartsRealmTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "06B120D41D811E6200D14B02"
+            BuildableName = "ChartsRealm.framework"
+            BlueprintName = "ChartsRealm"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -45,12 +65,19 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts-TV"
+            BlueprintIdentifier = "06B120D41D811E6200D14B02"
+            BuildableName = "ChartsRealm.framework"
+            BlueprintName = "ChartsRealm"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "FB_REFERENCE_IMAGE_DIR"
+            value = "$(SOURCE_ROOT)/Tests/ChartsRealm/ReferenceImages"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
@@ -63,9 +90,9 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts-TV"
+            BlueprintIdentifier = "06B120D41D811E6200D14B02"
+            BuildableName = "ChartsRealm.framework"
+            BlueprintName = "ChartsRealm"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/Charts/Cartfile.private b/Charts/Cartfile.private
diff --git a/Charts/Cartfile.resolved b/Charts/Cartfile.resolved