Skip to content

Commit 5e6d7b2

Browse files
committed
Bumping podspec version to 2.6.2
Also struggled to push the podspec to trunk. (It wouldn't lint either.) Had to make some compromises here just to get it pushed. Perhaps someone more knowledgable with podspec's can find a cleaner alternative.
1 parent c12c600 commit 5e6d7b2

File tree

1 file changed

+29
-13
lines changed

1 file changed

+29
-13
lines changed

YapDatabase.podspec

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "YapDatabase"
3-
s.version = "2.6.1"
3+
s.version = "2.6.2"
44
s.summary = "A key/value store built atop sqlite for iOS & Mac."
55
s.homepage = "https://github.com/yapstudios/YapDatabase"
66
s.license = 'MIT'
@@ -11,29 +11,45 @@ Pod::Spec.new do |s|
1111

1212
s.default_subspec = 'standard'
1313

14-
s.subspec 'common' do |ss|
15-
ss.source_files = 'YapDatabase/**/*.{h,m,mm}'
16-
ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib' }
17-
18-
ss.private_header_files = 'YapDatabase/**/Internal/*.h'
19-
ss.dependency 'CocoaLumberjack', '~> 1'
20-
ss.requires_arc = true
21-
end
14+
# This is failing when I 'pod spec lint' or 'pod trunk push' ...
15+
# Is there a way to get around this ?
16+
# The failure is because there is no 'ss.library' or 'ss.dependency' that pulls in sqlite.
17+
#
18+
# s.subspec 'common' do |ss|
19+
# ss.dependency 'CocoaLumberjack', '~> 1'
20+
#
21+
# ss.source_files = 'YapDatabase/**/*.{h,m,mm}'
22+
# ss.private_header_files = 'YapDatabase/**/Internal/*.h'
23+
#
24+
# ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib' }
25+
# ss.requires_arc = true
26+
# end
2227

2328
# use a builtin version of sqlite3
2429
s.subspec 'standard' do |ss|
30+
2531
ss.library = 'sqlite3'
26-
ss.dependency 'YapDatabase/common'
32+
# ss.dependency 'YapDatabase/common'
33+
34+
ss.dependency 'CocoaLumberjack', '~> 1'
35+
ss.source_files = 'YapDatabase/**/*.{h,m,mm}'
36+
ss.private_header_files = 'YapDatabase/**/Internal/*.h'
37+
ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib' }
2738
ss.requires_arc = true
2839
end
2940

3041
# use SQLCipher and enable -DSQLITE_HAS_CODEC flag
3142
s.subspec 'SQLCipher' do |ss|
3243
ss.dependency 'SQLCipher/fts'
33-
ss.dependency 'YapDatabase/common'
34-
ss.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' }
44+
# ss.dependency 'YapDatabase/common'
45+
46+
ss.dependency 'CocoaLumberjack', '~> 1'
47+
ss.source_files = 'YapDatabase/**/*.{h,m,mm}'
48+
ss.private_header_files = 'YapDatabase/**/Internal/*.h'
49+
ss.xcconfig = { 'OTHER_LDFLAGS' => '-weak_library /usr/lib/libc++.dylib', 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' }
3550
ss.requires_arc = true
51+
52+
ss.xcconfig = { }
3653
end
3754

38-
s.requires_arc = true
3955
end

0 commit comments

Comments
 (0)