fix cocoapods setup

remove the prepare command since its not needed. To lint pod you need to set (export FORK_XCODE_WRITING=true) to get around the prepare_command issue with realm. Update cocoapods and include a swift-version file for safety

Author: pmairoldi

.swift-version

@@ -0,0 +1 @@
+2.3

Charts.podspec

@@ -10,7 +10,6 @@ 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' Source/ChartsRealm/**/*.swift"
 
  s.subspec "Core" do |ss|
  ss.source_files = "Source/Charts/**/*.swift"

Charts.xcodeproj/project.pbxproj

@@ -1299,6 +1299,7 @@
 INFOPLIST_FILE = "$(SRCROOT)/Source/Supporting Files/Info.plist";
 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+OTHER_SWIFT_FLAGS = "-DNEEDS_CHARTS";
 PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealm;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SKIP_INSTALL = YES;
@@ -1317,6 +1318,7 @@
 INFOPLIST_FILE = "$(SRCROOT)/Source/Supporting Files/Info.plist";
 INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
+OTHER_SWIFT_FLAGS = "-DNEEDS_CHARTS";
 PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealm;
 PRODUCT_NAME = "$(TARGET_NAME)";
 SKIP_INSTALL = YES;

Gemfile

@@ -2,4 +2,4 @@ source "https://rubygems.org"
 
 gem "rake"
 gem "xcpretty"
-gem "cocoapods"
+gem "cocoapods", "1.1.0.rc.2"

Gemfile.lock

@@ -1,31 +1,33 @@
 GEM
  remote: https://rubygems.org/
  specs:
- activesupport (5.0.0.1)
- concurrent-ruby (~> 1.0, >= 1.0.2)
+ activesupport (4.2.7.1)
  i18n (~> 0.7)
+ json (~> 1.7, >= 1.7.7)
  minitest (~> 5.1)
+ thread_safe (~> 0.3, >= 0.3.4)
  tzinfo (~> 1.1)
  claide (1.0.0)
- cocoapods (1.0.1)
- activesupport (>= 4.0.2)
+ cocoapods (1.1.0.rc.2)
+ activesupport (>= 4.0.2, < 5)
  claide (>= 1.0.0, < 2.0)
- cocoapods-core (= 1.0.1)
- cocoapods-deintegrate (>= 1.0.0, < 2.0)
- cocoapods-downloader (>= 1.0.0, < 2.0)
+ cocoapods-core (= 1.1.0.rc.2)
+ cocoapods-deintegrate (>= 1.0.1, < 2.0)
+ cocoapods-downloader (>= 1.1.1, < 2.0)
  cocoapods-plugins (>= 1.0.0, < 2.0)
  cocoapods-search (>= 1.0.0, < 2.0)
  cocoapods-stats (>= 1.0.0, < 2.0)
  cocoapods-trunk (>= 1.0.0, < 2.0)
- cocoapods-try (>= 1.0.0, < 2.0)
+ cocoapods-try (>= 1.1.0, < 2.0)
  colored (~> 1.2)
  escape (~> 0.0.4)
- fourflusher (~> 0.3.0)
- molinillo (~> 0.4.5)
+ fourflusher (~> 1.0.1)
+ gh_inspector (~> 1.0)
+ molinillo (~> 0.5.1)
  nap (~> 1.0)
- xcodeproj (>= 1.1.0, < 2.0)
- cocoapods-core (1.0.1)
- activesupport (>= 4.0.2)
+ xcodeproj (>= 1.3.1, < 2.0)
+ cocoapods-core (1.1.0.rc.2)
+ activesupport (>= 4.0.2, < 5)
  fuzzy_match (~> 2.0.4)
  nap (~> 1.0)
  cocoapods-deintegrate (1.0.1)
@@ -39,16 +41,17 @@ GEM
  netrc (= 0.7.8)
  cocoapods-try (1.1.0)
  colored (1.2)
- concurrent-ruby (1.0.2)
  escape (0.0.4)
- fourflusher (0.3.2)
+ fourflusher (1.0.1)
  fuzzy_match (2.0.4)
+ gh_inspector (1.0.2)
  i18n (0.7.0)
+ json (1.8.3)
  minitest (5.9.0)
- molinillo (0.4.5)
+ molinillo (0.5.1)
  nap (1.1.0)
  netrc (0.7.8)
- rake (11.2.2)
+ rake (11.3.0)
  rouge (1.11.1)
  thread_safe (0.3.5)
  tzinfo (1.2.2)
@@ -64,9 +67,9 @@ PLATFORMS
  ruby
 
 DEPENDENCIES
- cocoapods
+ cocoapods (= 1.1.0.rc.2)
  rake
  xcpretty
 
 BUNDLED WITH
- 1.12.5
+ 1.13.1

Source/ChartsRealm/Data/RealmBarData.swift

@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmBarData: BarChartData
  super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
  }
  }
-}
+}

Source/ChartsRealm/Data/RealmBarDataSet.swift

@@ -14,8 +14,9 @@
 
 import Foundation
 import CoreGraphics
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 

Source/ChartsRealm/Data/RealmBarLineScatterCandleBubbleDataSet.swift

@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -40,4 +41,4 @@ public class RealmBarLineScatterCandleBubbleDataSet: RealmBaseDataSet, IBarLineS
  copy.highlightLineDashLengths = highlightLineDashLengths
  return copy
  }
-}
+}

Source/ChartsRealm/Data/RealmBaseDataSet.swift

@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 

Source/ChartsRealm/Data/RealmBubbleData.swift

@@ -13,8 +13,9 @@
 //
 
 import Foundation
-
+#if NEEDS_CHARTS
 import Charts
+#endif
 import Realm
 import Realm.Dynamic
 
@@ -31,4 +32,4 @@ public class RealmBubbleData: BubbleChartData
  super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
  }
  }
-}
+}