fixes realm issues

sutext · Feb 9, 2016 · 3068984 · 3068984
1 parent 7b5a9c7
commit 3068984
Show file tree

Hide file tree

Showing 16 changed files with 351 additions and 12 deletions.
diff --git a/Charts.podspec b/Charts.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = "Charts"
-  s.version = "2.2.1"
+  s.version = "2.2.2"
   s.summary = "ios-charts is a powerful & easy to use chart library for iOS"
   s.homepage = "https://github.com/danielgindi/ios-charts"
   s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
@@ -9,14 +9,14 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = "9.0"
   s.source = { :git => "https://github.com/danielgindi/ios-charts.git", :tag => "v#{s.version}" }
   s.default_subspec = "Core"
+  s.prepare_command = "sed -i '' -e 's/import Charts//g' ChartsRealm/Classes/**/*.swift"
 
   s.subspec "Core" do |ss|
     ss.source_files  = "Charts/Classes/**/*.swift"
-    ss.exclude_files = "Charts/Classes/**/{Realm}*.swift"
   end
 
   s.subspec "Realm" do |ss|
-    ss.source_files  = "Charts/Classes/**/{Realm}*.swift"
+    ss.source_files  = "ChartsRealm/Classes/**/*.swift"
     ss.dependency "Charts/Core"
     ss.dependency "RealmSwift", "~> 0.97"
   end

diff --git a/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-TV.xcscheme b/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-TV.xcscheme
@@ -0,0 +1,80 @@
+<?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 = "A52C5C361BAC5CA400594CDD"
+               BuildableName = "Charts.framework"
+               BlueprintName = "Charts-TV"
+               ReferencedContainer = "container:Charts.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <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 = "A52C5C361BAC5CA400594CDD"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts-TV"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts-TV"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-iOS.xcscheme b/Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-iOS.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 = "5BA8EC3F1A9D14DC00CE82E1"
+               BuildableName = "Charts.framework"
+               BlueprintName = "Charts-iOS"
+               ReferencedContainer = "container:Charts.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 = "06AEE7A11BDC3F8B009875AE"
+               BuildableName = "ChartsTests.xctest"
+               BlueprintName = "ChartsTests"
+               ReferencedContainer = "container:Charts.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts-iOS"
+            ReferencedContainer = "container:Charts.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 = "5BA8EC3F1A9D14DC00CE82E1"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts-iOS"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts-iOS"
+            ReferencedContainer = "container:Charts.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/ChartsDemo/Classes/RealmDemos/RealmBarChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmBarChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmBarChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmBubbleChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmBubbleChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmBubbleChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmCandleChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmCandleChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmCandleChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmHorizontalBarChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmHorizontalBarChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmHorizontalBarChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmLineChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmLineChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmLineChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmPieChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmPieChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmPieChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmRadarChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmRadarChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmRadarChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmScatterChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmScatterChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmScatterChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsDemo/Classes/RealmDemos/RealmWikiExampleChartViewController.h b/ChartsDemo/Classes/RealmDemos/RealmWikiExampleChartViewController.h
@@ -13,7 +13,7 @@
 
 #import <UIKit/UIKit.h>
 #import "RealmDemoBaseViewController.h"
-#import <Charts/Charts.h>
+#import <ChartsRealm/ChartsRealm.h>
 
 @interface RealmWikiExampleChartViewController : RealmDemoBaseViewController
 

diff --git a/ChartsRealm/Cartfile.private b/ChartsRealm/Cartfile.private
diff --git a/ChartsRealm/Cartfile.resolved b/ChartsRealm/Cartfile.resolved
diff --git a/ChartsRealm/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm-TV.xcscheme b/ChartsRealm/ChartsRealm.xcodeproj/xcshareddata/xcschemes/ChartsRealm-TV.xcscheme
@@ -0,0 +1,80 @@
+<?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 = "A52C5C361BAC5CA400594CDD"
+               BuildableName = "ChartsRealm.framework"
+               BlueprintName = "ChartsRealm-TV"
+               ReferencedContainer = "container:ChartsRealm.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <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 = "A52C5C361BAC5CA400594CDD"
+            BuildableName = "ChartsRealm.framework"
+            BlueprintName = "ChartsRealm-TV"
+            ReferencedContainer = "container:ChartsRealm.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
+            BuildableName = "ChartsRealm.framework"
+            BlueprintName = "ChartsRealm-TV"
+            ReferencedContainer = "container:ChartsRealm.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>