Skip to content

Commit bcd80ff

Browse files
committed
CocoaPods hates me
Why the fuck cannot I not name files like I want to CocoaPods? Why? Carthage FTW :P
1 parent 1ab72df commit bcd80ff

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

PromiseKit.podspec

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Pod::Spec.new do |s|
66
s.version = $1
77

88
s.source = { :git => "https://github.com/mxcl/#{s.name}.git", :tag => s.version }
9-
s.license = 'MIT'
9+
s.license = { :type => 'MIT', :text => '@see README' }
1010
s.summary = 'A delightful Promises implementation for iOS and OS X.'
1111
s.homepage = 'http://promisekit.org'
1212
s.description = 'UIActionSheet UIAlertView CLLocationManager MFMailComposeViewController ACAccountStore StoreKit SKRequest SKProductRequest blocks'
@@ -17,7 +17,7 @@ Pod::Spec.new do |s|
1717
s.requires_arc = true
1818
s.ios.deployment_target = '8.0'
1919
s.osx.deployment_target = '10.9'
20-
s.module_map = 'Sources/module.map'
20+
s.module_map = 'Sources/PMK.modulemap'
2121
s.xcconfig = { 'SWIFT_INSTALL_OBJC_HEADER' => 'NO' }
2222

2323
s.subspec 'Accounts' do |ss|
@@ -57,7 +57,7 @@ Pod::Spec.new do |s|
5757

5858
ss.source_files = 'Sources/*.{swift}', 'Sources/{after,AnyPromise,dispatch_promise,hang,join,PMKPromise,when}.m', *hh
5959
ss.public_header_files = hh
60-
ss.private_header_files = 'Sources/__AnyPromise.h'
60+
ss.private_header_files = 'Sources/AnyPromise+Private.h'
6161
ss.frameworks = 'Foundation'
6262
end
6363

@@ -100,7 +100,8 @@ Pod::Spec.new do |s|
100100
end
101101

102102
s.subspec 'Social' do |ss|
103-
ss.source_files = 'Categories/Social/*'
103+
ss.ios.source_files = 'Categories/Social/*'
104+
ss.osx.source_files = Dir['Categories/Social/*'] - ['Categories/Social/SLComposeViewController+Promise.swift']
104105
ss.dependency 'PromiseKit/CorePromise'
105106
ss.frameworks = 'Social'
106107
end
@@ -127,13 +128,13 @@ Pod::Spec.new do |s|
127128
####################################################### deprecated
128129
%w{base Promise Pause Until When Join Hang Zalgo}.each do |name|
129130
s.subspec name do |ss|
130-
ss.deprecated = true
131+
#ss.deprecated = true
131132
ss.dependency 'PromiseKit/CorePromise'
132133
end
133134
end
134135

135136
s.subspec 'all' do |ss|
136-
ss.deprecated = true
137+
#ss.deprecated = true
137138
ss.dependency 'PromiseKit/Accounts'
138139
ss.dependency 'PromiseKit/AVFoundation'
139140
ss.dependency 'PromiseKit/CloudKit'
@@ -162,33 +163,33 @@ Pod::Spec.new do |s|
162163
end
163164
s.subspec name do |ss|
164165
ss.dependency "PromiseKit/#{framework}"
165-
ss.deprecated = true
166+
#ss.deprecated = true
166167
end
167168
end
168169

169170
s.subspec 'Swift' do |ss|
170-
ss.deprecated = true
171+
#ss.deprecated = true
171172
ss.default_subspecs = 'Foundation', 'UIKit'
172173

173174
ss.subspec 'Promise' do |sss|
174-
sss.deprecated = true
175+
#sss.deprecated = true
175176
sss.dependency 'PromiseKit/CorePromise'
176177
end
177178

178179
ss.subspec 'NSJSONFromData' do |sss|
179-
sss.deprecated = true
180+
#sss.deprecated = true
180181
sss.dependency 'PromiseKit/CorePromise'
181182
end
182183

183184
%w{CloudKit UIKit CoreLocation MapKit Social StoreKit Foundation NSNotificationCenter Accounts AVFoundation}.each do |name|
184185
ss.subspec(name) do |sss|
185-
sss.deprecated = true
186+
#sss.deprecated = true
186187
sss.dependency "PromiseKit/#{name}"
187188
end
188189
end
189190

190191
ss.subspec 'all' do |sss|
191-
sss.deprecated = true
192+
#sss.deprecated = true
192193
sss.dependency 'PromiseKit/Swift/CloudKit'
193194
sss.dependency 'PromiseKit/Swift/CoreLocation'
194195
sss.dependency 'PromiseKit/Swift/Foundation'

PromiseKit.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,7 +1808,7 @@
18081808
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
18091809
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
18101810
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1811-
MODULEMAP_FILE = Sources/module.map;
1811+
MODULEMAP_FILE = Sources/PMK.modulemap;
18121812
PRODUCT_NAME = PromiseKit;
18131813
SKIP_INSTALL = YES;
18141814
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1828,7 +1828,7 @@
18281828
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
18291829
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
18301830
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1831-
MODULEMAP_FILE = Sources/module.map;
1831+
MODULEMAP_FILE = Sources/PMK.modulemap;
18321832
PRODUCT_NAME = PromiseKit;
18331833
SKIP_INSTALL = YES;
18341834
};
@@ -1843,7 +1843,7 @@
18431843
DEFINES_MODULE = YES;
18441844
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
18451845
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1846-
MODULEMAP_FILE = Sources/module.map;
1846+
MODULEMAP_FILE = Sources/PMK.modulemap;
18471847
PRODUCT_NAME = PromiseKit;
18481848
SDKROOT = macosx;
18491849
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -1859,7 +1859,7 @@
18591859
DEFINES_MODULE = YES;
18601860
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
18611861
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
1862-
MODULEMAP_FILE = Sources/module.map;
1862+
MODULEMAP_FILE = Sources/PMK.modulemap;
18631863
PRODUCT_NAME = PromiseKit;
18641864
SDKROOT = macosx;
18651865
};
File renamed without changes.

0 commit comments

Comments
 (0)