Skip to content

Commit

Permalink
fix cocoapods setup
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pmairoldi committed Sep 21, 2016
1 parent 2813ef5 commit fcb6b2f
Show file tree
Hide file tree
Showing 23 changed files with 76 additions and 53 deletions.
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.3
1 change: 0 additions & 1 deletion Charts.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions Charts.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ source "https://rubygems.org"

gem "rake"
gem "xcpretty"
gem "cocoapods"
gem "cocoapods", "1.1.0.rc.2"
41 changes: 22 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand All @@ -64,9 +67,9 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods
cocoapods (= 1.1.0.rc.2)
rake
xcpretty

BUNDLED WITH
1.12.5
1.13.1
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmBarData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand All @@ -31,4 +32,4 @@ public class RealmBarData: BarChartData
super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
}
}
}
}
3 changes: 2 additions & 1 deletion Source/ChartsRealm/Data/RealmBarDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

import Foundation
import CoreGraphics

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand All @@ -40,4 +41,4 @@ public class RealmBarLineScatterCandleBubbleDataSet: RealmBaseDataSet, IBarLineS
copy.highlightLineDashLengths = highlightLineDashLengths
return copy
}
}
}
3 changes: 2 additions & 1 deletion Source/ChartsRealm/Data/RealmBaseDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmBubbleData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand All @@ -31,4 +32,4 @@ public class RealmBubbleData: BubbleChartData
super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
}
}
}
}
3 changes: 2 additions & 1 deletion Source/ChartsRealm/Data/RealmBubbleDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

import Foundation
import CoreGraphics

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmCandleData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand All @@ -31,4 +32,4 @@ public class RealmCandleData: CandleChartData
super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
}
}
}
}
3 changes: 2 additions & 1 deletion Source/ChartsRealm/Data/RealmCandleDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

import Foundation
import CoreGraphics

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmLineData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand All @@ -31,4 +32,4 @@ public class RealmLineData: LineChartData
super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
}
}
}
}
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmLineDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down Expand Up @@ -194,4 +195,4 @@ public class RealmLineDataSet: RealmLineRadarDataSet, ILineChartDataSet
return copy
}

}
}
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmLineRadarDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

import Foundation
import CoreGraphics

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down Expand Up @@ -93,4 +94,4 @@ public class RealmLineRadarDataSet: RealmLineScatterCandleRadarDataSet, ILineRad
return copy
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down Expand Up @@ -54,4 +55,4 @@ public class RealmLineScatterCandleRadarDataSet: RealmBarLineScatterCandleBubble
return copy
}

}
}
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmPieData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand All @@ -31,4 +32,4 @@ public class RealmPieData: PieChartData
super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
}
}
}
}
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmPieDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

import Foundation
import CoreGraphics

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down Expand Up @@ -88,4 +89,4 @@ public class RealmPieDataSet: RealmBaseDataSet, IPieChartDataSet
copy.selectionShift = selectionShift
return copy
}
}
}
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmRadarData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation
#if NEEDS_CHARTS
import Charts

#endif
import Realm
import Realm.Dynamic

Expand All @@ -31,4 +32,4 @@ public class RealmRadarData: RadarChartData
super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
}
}
}
}
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmRadarDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@

import Foundation
import CoreGraphics

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand Down Expand Up @@ -50,4 +51,4 @@ public class RealmRadarDataSet: RealmLineRadarDataSet, IRadarChartDataSet
public var highlightCircleOuterRadius: CGFloat = 4.0

public var highlightCircleStrokeWidth: CGFloat = 2.0
}
}
5 changes: 3 additions & 2 deletions Source/ChartsRealm/Data/RealmScatterData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
//

import Foundation

#if NEEDS_CHARTS
import Charts
#endif
import Realm
import Realm.Dynamic

Expand All @@ -31,4 +32,4 @@ public class RealmScatterData: ScatterChartData
super.init(xVals: RealmChartUtils.toXVals(results: results!, xValueField: xValueField), dataSets: dataSets)
}
}
}
}
Loading

0 comments on commit fcb6b2f

Please sign in to comment.