move charts and charts realm to same project

Author: pmairoldi

.travis.yml

@@ -10,7 +10,7 @@ cache:
 
 before_install:
   - brew update
-  - cd Charts && carthage bootstrap
+  - carthage bootstrap
 
 script:
   - rake test

Charts.xcodeproj/project.pbxproj

@@ -26,7 +26,8 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      codeCoverageEnabled = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -73,7 +74,7 @@
       <EnvironmentVariables>
          <EnvironmentVariable
             key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages"
+            value = "$(SOURCE_ROOT)/Tests/Charts/ReferenceImages"
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>

Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme

@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
+               BlueprintIdentifier = "06B120D41D811E6200D14B02"
                BuildableName = "ChartsRealm.framework"
-               BlueprintName = "ChartsRealm-TV"
-               ReferencedContainer = "container:ChartsRealm.xcodeproj">
+               BlueprintName = "ChartsRealm"
+               ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -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"
+            BlueprintIdentifier = "06B120D41D811E6200D14B02"
             BuildableName = "ChartsRealm.framework"
-            BlueprintName = "ChartsRealm-TV"
-            ReferencedContainer = "container:ChartsRealm.xcodeproj">
+            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,10 +90,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
+            BlueprintIdentifier = "06B120D41D811E6200D14B02"
             BuildableName = "ChartsRealm.framework"
-            BlueprintName = "ChartsRealm-TV"
-            ReferencedContainer = "container:ChartsRealm.xcodeproj">
+            BlueprintName = "ChartsRealm"
+            ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>