Skip to content

Commit 1bfbdd2

Browse files
aferditamuriqiaferditamuriqi
authored
Merge pull request #1 from edrlab/develop
Match module name for carthage vs cocoapods
2 parents 9cb7caa + 71ffde1 commit 1bfbdd2

11 files changed

+123
-1071
lines changed

‎Frameworks/Info.plist

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>
1414
<string>$(PRODUCT_NAME)</string>
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
17-
<key>CFBundleVersion</key>
18-
<string>${BUNDLE_VERSION_STRING}</string>
1917
<key>CFBundleShortVersionString</key>
2018
<string>${BUNDLE_VERSION_STRING}</string>
19+
<key>CFBundleVersion</key>
20+
<string>${BUNDLE_VERSION_STRING}</string>
2121
</dict>
2222
</plist>

‎Frameworks/Tests.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#import <GCDWebServers/GCDWebServers.h>
1+
#import <GCDWebServer/GCDWebServer.h>
22
#import <XCTest/XCTest.h>
33

44
#pragma clang diagnostic ignored "-Weverything" // Prevent "messaging to unqualified id" warnings

‎Frameworks/module.modulemap

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
framework module GCDWebServers {
1+
framework module GCDWebServer {
22
umbrella header "GCDWebServers.h"
33
}

‎GCDWebServer.podspec

+3-11
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@
77

88
Pod::Spec.new do |s|
99
s.name = 'GCDWebServer'
10-
s.version = '3.5.3'
10+
s.version = '3.5.6'
1111
s.author = { 'Pierre-Olivier Latour' => '[email protected]' }
1212
s.license = { :type => 'BSD', :file => 'LICENSE' }
13-
s.homepage = 'https://github.com/swisspol/GCDWebServer'
13+
s.homepage = 'https://github.com/edrlab/GCDWebServer'
1414
s.summary = 'Lightweight GCD based HTTP server for OS X & iOS (includes web based uploader & WebDAV server)'
1515

16-
s.source = { :git => 'https://github.com/swisspol/GCDWebServer.git', :tag => s.version.to_s }
16+
s.source = { :git => 'https://github.com/edrlab/GCDWebServer.git', :tag => s.version.to_s }
1717
s.ios.deployment_target = '8.0'
18-
s.tvos.deployment_target = '9.0'
19-
s.osx.deployment_target = '10.7'
2018
s.requires_arc = true
2119

2220
s.default_subspec = 'Core'
@@ -27,19 +25,13 @@ Pod::Spec.new do |s|
2725
cs.requires_arc = true
2826
cs.ios.library = 'z'
2927
cs.ios.frameworks = 'MobileCoreServices', 'CFNetwork'
30-
cs.tvos.library = 'z'
31-
cs.tvos.frameworks = 'MobileCoreServices', 'CFNetwork'
32-
cs.osx.library = 'z'
33-
cs.osx.framework = 'SystemConfiguration'
3428
end
3529

3630
s.subspec 'WebDAV' do |cs|
3731
cs.dependency 'GCDWebServer/Core'
3832
cs.source_files = 'GCDWebDAVServer/*.{h,m}'
3933
cs.requires_arc = true
4034
cs.ios.library = 'xml2'
41-
cs.tvos.library = 'xml2'
42-
cs.osx.library = 'xml2'
4335
cs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2'
4436
end
4537

‎GCDWebServer.xcodeproj/project.pbxproj

+81-915
Large diffs are not rendered by default.

‎GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (iOS).xcscheme renamed to ‎GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServer (iOS).xcscheme

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -15,8 +15,8 @@
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
18-
BuildableName = "GCDWebServers.framework"
19-
BlueprintName = "GCDWebServers (iOS)"
18+
BuildableName = "GCDWebServer.framework"
19+
BlueprintName = "GCDWebServer (iOS)"
2020
ReferencedContainer = "container:GCDWebServer.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
@@ -27,19 +27,17 @@
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
30-
<Testables>
31-
</Testables>
3230
<MacroExpansion>
3331
<BuildableReference
3432
BuildableIdentifier = "primary"
3533
BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
36-
BuildableName = "GCDWebServers.framework"
37-
BlueprintName = "GCDWebServers (iOS)"
34+
BuildableName = "GCDWebServer.framework"
35+
BlueprintName = "GCDWebServer (iOS)"
3836
ReferencedContainer = "container:GCDWebServer.xcodeproj">
3937
</BuildableReference>
4038
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
39+
<Testables>
40+
</Testables>
4341
</TestAction>
4442
<LaunchAction
4543
buildConfiguration = "Debug"
@@ -55,13 +53,11 @@
5553
<BuildableReference
5654
BuildableIdentifier = "primary"
5755
BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
58-
BuildableName = "GCDWebServers.framework"
59-
BlueprintName = "GCDWebServers (iOS)"
56+
BuildableName = "GCDWebServer.framework"
57+
BlueprintName = "GCDWebServer (iOS)"
6058
ReferencedContainer = "container:GCDWebServer.xcodeproj">
6159
</BuildableReference>
6260
</MacroExpansion>
63-
<AdditionalOptions>
64-
</AdditionalOptions>
6561
</LaunchAction>
6662
<ProfileAction
6763
buildConfiguration = "Release"
@@ -73,8 +69,8 @@
7369
<BuildableReference
7470
BuildableIdentifier = "primary"
7571
BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
76-
BuildableName = "GCDWebServers.framework"
77-
BlueprintName = "GCDWebServers (iOS)"
72+
BuildableName = "GCDWebServer.framework"
73+
BlueprintName = "GCDWebServer (iOS)"
7874
ReferencedContainer = "container:GCDWebServer.xcodeproj">
7975
</BuildableReference>
8076
</MacroExpansion>

‎GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (tvOS).xcscheme renamed to ‎GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServer Sample (iOS).xcscheme

+20-31
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1030"
3+
LastUpgradeVersion = "1120"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
88
<BuildActionEntries>
99
<BuildActionEntry
10-
buildForTesting = "NO"
10+
buildForTesting = "YES"
1111
buildForRunning = "YES"
1212
buildForProfiling = "YES"
1313
buildForArchiving = "YES"
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
18-
BuildableName = "GCDWebServers.framework"
19-
BlueprintName = "GCDWebServers (tvOS)"
20-
ReferencedContainer = "container:GCDWebServer.xcodeproj">
17+
BlueprintIdentifier = "E2DDD1F51BE69EE4002CE867"
18+
BuildableName = "GCDWebServer.app"
19+
BlueprintName = "GCDWebServer Sample (iOS)"
20+
ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -29,17 +29,6 @@
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
32-
<MacroExpansion>
33-
<BuildableReference
34-
BuildableIdentifier = "primary"
35-
BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
36-
BuildableName = "GCDWebServers.framework"
37-
BlueprintName = "GCDWebServers (tvOS)"
38-
ReferencedContainer = "container:GCDWebServer.xcodeproj">
39-
</BuildableReference>
40-
</MacroExpansion>
41-
<AdditionalOptions>
42-
</AdditionalOptions>
4332
</TestAction>
4433
<LaunchAction
4534
buildConfiguration = "Debug"
@@ -51,33 +40,33 @@
5140
debugDocumentVersioning = "YES"
5241
debugServiceExtension = "internal"
5342
allowLocationSimulation = "YES">
54-
<MacroExpansion>
43+
<BuildableProductRunnable
44+
runnableDebuggingMode = "0">
5545
<BuildableReference
5646
BuildableIdentifier = "primary"
57-
BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
58-
BuildableName = "GCDWebServers.framework"
59-
BlueprintName = "GCDWebServers (tvOS)"
60-
ReferencedContainer = "container:GCDWebServer.xcodeproj">
47+
BlueprintIdentifier = "E2DDD1F51BE69EE4002CE867"
48+
BuildableName = "GCDWebServer.app"
49+
BlueprintName = "GCDWebServer Sample (iOS)"
50+
ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
6151
</BuildableReference>
62-
</MacroExpansion>
63-
<AdditionalOptions>
64-
</AdditionalOptions>
52+
</BuildableProductRunnable>
6553
</LaunchAction>
6654
<ProfileAction
6755
buildConfiguration = "Release"
6856
shouldUseLaunchSchemeArgsEnv = "YES"
6957
savedToolIdentifier = ""
7058
useCustomWorkingDirectory = "NO"
7159
debugDocumentVersioning = "YES">
72-
<MacroExpansion>
60+
<BuildableProductRunnable
61+
runnableDebuggingMode = "0">
7362
<BuildableReference
7463
BuildableIdentifier = "primary"
75-
BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
76-
BuildableName = "GCDWebServers.framework"
77-
BlueprintName = "GCDWebServers (tvOS)"
78-
ReferencedContainer = "container:GCDWebServer.xcodeproj">
64+
BlueprintIdentifier = "E2DDD1F51BE69EE4002CE867"
65+
BuildableName = "GCDWebServer.app"
66+
BlueprintName = "GCDWebServer Sample (iOS)"
67+
ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
7968
</BuildableReference>
80-
</MacroExpansion>
69+
</BuildableProductRunnable>
8170
</ProfileAction>
8271
<AnalyzeAction
8372
buildConfiguration = "Debug">

‎GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme

-91
This file was deleted.

‎iOS/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>CFBundleExecutable</key>
88
<string>$(EXECUTABLE_NAME)</string>
99
<key>CFBundleIdentifier</key>
10-
<string>net.pol-online.${PRODUCT_NAME:rfc1034identifier}</string>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>

‎iOS/ViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626
*/
2727

28-
import GCDWebServers
28+
import GCDWebServer
2929
import UIKit
3030

3131
class ViewController: UIViewController {

‎tvOS/ViewController.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626
*/
2727

28-
import GCDWebServers
28+
import GCDWebServer
2929
import UIKit
3030

3131
class ViewController: UIViewController {

0 commit comments

Comments
 (0)