Skip to content

Commit 7b0de2e

Browse files
committed
Merge pull request #725 from danielgindi/2.2.0-podspec-improvements
Update podspec for realm and 2.2.0
2 parents a633c73 + 771c236 commit 7b0de2e

File tree

4 files changed

+74
-4
lines changed

4 files changed

+74
-4
lines changed

Charts.podspec

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,16 @@ Pod::Spec.new do |s|
88
s.ios.deployment_target = "8.0"
99
s.tvos.deployment_target = "9.0"
1010
s.source = { :git => "https://github.com/danielgindi/ios-charts.git", :tag => "v#{s.version}" }
11-
s.source_files = "Classes", "Charts/Classes/**/*.swift"
11+
s.default_subspec = "Core"
12+
13+
s.subspec "Core" do |ss|
14+
ss.source_files = "Charts/Classes/**/*.swift"
15+
ss.exclude_files = "Charts/Classes/**/{Realm}*.swift"
16+
end
17+
18+
s.subspec "Realm" do |ss|
19+
ss.source_files = "Charts/Classes/**/{Realm}*.swift"
20+
ss.dependency "Charts/Core"
21+
ss.dependency "RealmSwift", "~> 0.97"
22+
end
1223
end

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ source "https://rubygems.org"
22

33
gem "rake"
44
gem "xcpretty"
5+
gem "cocoapods"

Gemfile.lock

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,67 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
rake (10.4.2)
4+
activesupport (4.2.5.1)
5+
i18n (~> 0.7)
6+
json (~> 1.7, >= 1.7.7)
7+
minitest (~> 5.1)
8+
thread_safe (~> 0.3, >= 0.3.4)
9+
tzinfo (~> 1.1)
10+
claide (0.9.1)
11+
cocoapods (0.39.0)
12+
activesupport (>= 4.0.2)
13+
claide (~> 0.9.1)
14+
cocoapods-core (= 0.39.0)
15+
cocoapods-downloader (~> 0.9.3)
16+
cocoapods-plugins (~> 0.4.2)
17+
cocoapods-search (~> 0.1.0)
18+
cocoapods-stats (~> 0.6.2)
19+
cocoapods-trunk (~> 0.6.4)
20+
cocoapods-try (~> 0.5.1)
21+
colored (~> 1.2)
22+
escape (~> 0.0.4)
23+
molinillo (~> 0.4.0)
24+
nap (~> 1.0)
25+
xcodeproj (~> 0.28.2)
26+
cocoapods-core (0.39.0)
27+
activesupport (>= 4.0.2)
28+
fuzzy_match (~> 2.0.4)
29+
nap (~> 1.0)
30+
cocoapods-downloader (0.9.3)
31+
cocoapods-plugins (0.4.2)
32+
nap
33+
cocoapods-search (0.1.0)
34+
cocoapods-stats (0.6.2)
35+
cocoapods-trunk (0.6.4)
36+
nap (>= 0.8, < 2.0)
37+
netrc (= 0.7.8)
38+
cocoapods-try (0.5.1)
39+
colored (1.2)
40+
escape (0.0.4)
41+
fuzzy_match (2.0.4)
42+
i18n (0.7.0)
43+
json (1.8.3)
44+
minitest (5.8.4)
45+
molinillo (0.4.1)
46+
nap (1.1.0)
47+
netrc (0.7.8)
48+
rake (10.5.0)
549
rouge (1.10.1)
50+
thread_safe (0.3.5)
51+
tzinfo (1.2.2)
52+
thread_safe (~> 0.1)
53+
xcodeproj (0.28.2)
54+
activesupport (>= 3)
55+
claide (~> 0.9.1)
56+
colored (~> 1.2)
657
xcpretty (0.2.2)
758
rouge (~> 1.8)
859

960
PLATFORMS
1061
ruby
1162

1263
DEPENDENCIES
64+
cocoapods
1365
rake
1466
xcpretty
1567

README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ If you want to compile for iOS 7:
5252
## CocoaPods Install
5353

5454
Add `pod 'Charts'` to your Podfile. "Charts" is the name of the library.
55+
56+
For Realm support you can specify the subspec in your Podfile as follows:
57+
```
58+
pod 'Charts/Realm'
59+
```
60+
5561
**Note:** ~~`pod 'ios-charts'`~~ is not the correct library, and refers to a different project by someone else.
5662

5763
## Carthage Install
@@ -70,7 +76,7 @@ In order to build the binaries for a new release, use `carthage build --no-skip-
7076
If you like what you see here, and want to support the work being done in this repository, you could:
7177
* Contribute code, issues and pull requests
7278
* Let people know this library exists (spread the word!)
73-
*
79+
*
7480
[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=68UL6Y8KUPS96) (You can buy me a beer, or you can buy me dinner :-)
7581

7682
**Note:** The author of [MPAndroidChart](https://github.com/PhilJay/MPAndroidChart) is the reason that this library exists, and is accepting [donations](https://github.com/PhilJay/MPAndroidChart#donations) on his page. He deserves them!
@@ -172,7 +178,7 @@ Or you can see the [**ChartsDemo**](https://github.com/danielgindi/ios-charts/tr
172178
Special Thanks
173179
=======
174180

175-
Goes to [@liuxuan30](https://github.com/liuxuan30), [@petester42](https://github.com/petester42) and [@AlBirdie](https://github.com/AlBirdie) for new features, bugfixes, and lots and lots of involvement in our open-sourced community! You guys are a huge help to all of those coming here with questions and issues, and I couldn't respond to all of those without you.
181+
Goes to [@liuxuan30](https://github.com/liuxuan30), [@petester42](https://github.com/petester42) and [@AlBirdie](https://github.com/AlBirdie) for new features, bugfixes, and lots and lots of involvement in our open-sourced community! You guys are a huge help to all of those coming here with questions and issues, and I couldn't respond to all of those without you.
176182

177183
License
178184
=======

0 commit comments

Comments
 (0)