Merge pull request #1 from edrlab/develop

Match module name for carthage vs cocoapods
readium · Nov 26, 2019 · 1bfbdd2 · 1bfbdd2
2 parents 9cb7caa + 71ffde1
commit 1bfbdd2
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 1,071 deletions.
diff --git a/Frameworks/Info.plist b/Frameworks/Info.plist
@@ -7,16 +7,16 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
-	<key>CFBundleVersion</key>
-	<string>${BUNDLE_VERSION_STRING}</string>
 	<key>CFBundleShortVersionString</key>
 	<string>${BUNDLE_VERSION_STRING}</string>
+	<key>CFBundleVersion</key>
+	<string>${BUNDLE_VERSION_STRING}</string>
 </dict>
 </plist>
diff --git a/Frameworks/Tests.m b/Frameworks/Tests.m
@@ -1,4 +1,4 @@
-#import <GCDWebServers/GCDWebServers.h>
+#import <GCDWebServer/GCDWebServer.h>
 #import <XCTest/XCTest.h>
 
 #pragma clang diagnostic ignored "-Weverything"  // Prevent "messaging to unqualified id" warnings

diff --git a/Frameworks/module.modulemap b/Frameworks/module.modulemap
@@ -1,3 +1,3 @@
-framework module GCDWebServers {
+framework module GCDWebServer {
   umbrella header "GCDWebServers.h"
 }
diff --git a/GCDWebServer.podspec b/GCDWebServer.podspec
@@ -7,16 +7,14 @@
 
 Pod::Spec.new do |s|
   s.name     = 'GCDWebServer'
-  s.version  = '3.5.3'
+  s.version  = '3.5.6'
   s.author   =  { 'Pierre-Olivier Latour' => 'info@pol-online.net' }
   s.license  = { :type => 'BSD', :file => 'LICENSE' }
-  s.homepage = 'https://github.com/swisspol/GCDWebServer'
+  s.homepage = 'https://github.com/edrlab/GCDWebServer'
   s.summary  = 'Lightweight GCD based HTTP server for OS X & iOS (includes web based uploader & WebDAV server)'
 
-  s.source   = { :git => 'https://github.com/swisspol/GCDWebServer.git', :tag => s.version.to_s }
+  s.source   = { :git => 'https://github.com/edrlab/GCDWebServer.git', :tag => s.version.to_s }
   s.ios.deployment_target = '8.0'
-  s.tvos.deployment_target = '9.0'
-  s.osx.deployment_target = '10.7'
   s.requires_arc = true
 
   s.default_subspec = 'Core'
@@ -27,19 +25,13 @@ Pod::Spec.new do |s|
     cs.requires_arc = true
     cs.ios.library = 'z'
     cs.ios.frameworks = 'MobileCoreServices', 'CFNetwork'
-    cs.tvos.library = 'z'
-    cs.tvos.frameworks = 'MobileCoreServices', 'CFNetwork'
-    cs.osx.library = 'z'
-    cs.osx.framework = 'SystemConfiguration'
   end
 
   s.subspec 'WebDAV' do |cs|
     cs.dependency 'GCDWebServer/Core'
     cs.source_files = 'GCDWebDAVServer/*.{h,m}'
     cs.requires_arc = true
     cs.ios.library = 'xml2'
-    cs.tvos.library = 'xml2'
-    cs.osx.library = 'xml2'
     cs.compiler_flags = '-I$(SDKROOT)/usr/include/libxml2'
   end
 

diff --git a/GCDWebServer.xcodeproj/project.pbxproj b/GCDWebServer.xcodeproj/project.pbxproj
diff --git a/...ta/xcschemes/GCDWebServers (iOS).xcscheme → ...ata/xcschemes/GCDWebServer (iOS).xcscheme b/...ta/xcschemes/GCDWebServers (iOS).xcscheme → ...ata/xcschemes/GCDWebServer (iOS).xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
-               BuildableName = "GCDWebServers.framework"
-               BlueprintName = "GCDWebServers (iOS)"
+               BuildableName = "GCDWebServer.framework"
+               BlueprintName = "GCDWebServer (iOS)"
                ReferencedContainer = "container:GCDWebServer.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -27,19 +27,17 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
-            BuildableName = "GCDWebServers.framework"
-            BlueprintName = "GCDWebServers (iOS)"
+            BuildableName = "GCDWebServer.framework"
+            BlueprintName = "GCDWebServer (iOS)"
             ReferencedContainer = "container:GCDWebServer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -55,13 +53,11 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
-            BuildableName = "GCDWebServers.framework"
-            BlueprintName = "GCDWebServers (iOS)"
+            BuildableName = "GCDWebServer.framework"
+            BlueprintName = "GCDWebServer (iOS)"
             ReferencedContainer = "container:GCDWebServer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -73,8 +69,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
-            BuildableName = "GCDWebServers.framework"
-            BlueprintName = "GCDWebServers (iOS)"
+            BuildableName = "GCDWebServer.framework"
+            BlueprintName = "GCDWebServer (iOS)"
             ReferencedContainer = "container:GCDWebServer.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...a/xcschemes/GCDWebServers (tvOS).xcscheme → ...chemes/GCDWebServer Sample (iOS).xcscheme b/...a/xcschemes/GCDWebServers (tvOS).xcscheme → ...chemes/GCDWebServer Sample (iOS).xcscheme
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
-            buildForTesting = "NO"
+            buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
             buildForArchiving = "YES"
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
-               BuildableName = "GCDWebServers.framework"
-               BlueprintName = "GCDWebServers (tvOS)"
-               ReferencedContainer = "container:GCDWebServer.xcodeproj">
+               BlueprintIdentifier = "E2DDD1F51BE69EE4002CE867"
+               BuildableName = "GCDWebServer.app"
+               BlueprintName = "GCDWebServer Sample (iOS)"
+               ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -29,17 +29,6 @@
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
-            BuildableName = "GCDWebServers.framework"
-            BlueprintName = "GCDWebServers (tvOS)"
-            ReferencedContainer = "container:GCDWebServer.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -51,33 +40,33 @@
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
-            BuildableName = "GCDWebServers.framework"
-            BlueprintName = "GCDWebServers (tvOS)"
-            ReferencedContainer = "container:GCDWebServer.xcodeproj">
+            BlueprintIdentifier = "E2DDD1F51BE69EE4002CE867"
+            BuildableName = "GCDWebServer.app"
+            BlueprintName = "GCDWebServer Sample (iOS)"
+            ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      </BuildableProductRunnable>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E2DDD18A1BE69404002CE867"
-            BuildableName = "GCDWebServers.framework"
-            BlueprintName = "GCDWebServers (tvOS)"
-            ReferencedContainer = "container:GCDWebServer.xcodeproj">
+            BlueprintIdentifier = "E2DDD1F51BE69EE4002CE867"
+            BuildableName = "GCDWebServer.app"
+            BlueprintName = "GCDWebServer Sample (iOS)"
+            ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
          </BuildableReference>
-      </MacroExpansion>
+      </BuildableProductRunnable>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

diff --git a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme b/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme
diff --git a/iOS/Info.plist b/iOS/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>net.pol-online.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/iOS/ViewController.swift b/iOS/ViewController.swift
@@ -25,7 +25,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import GCDWebServers
+import GCDWebServer
 import UIKit
 
 class ViewController: UIViewController {

diff --git a/tvOS/ViewController.swift b/tvOS/ViewController.swift
@@ -25,7 +25,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import GCDWebServers
+import GCDWebServer
 import UIKit
 
 class ViewController: UIViewController {