fixing conflicts

readium · Nov 26, 2019 · 8cfaa97 · 8cfaa97
1 parent 8e0a43f
commit 8cfaa97
Show file tree

Hide file tree

Showing 7 changed files with 94 additions and 621 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/module.modulemap b/Frameworks/module.modulemap
@@ -1,3 +1,3 @@
 framework module GCDWebServer {
-  umbrella header "GCDWebServer.h"
+  umbrella header "GCDWebServers.h"
 }
diff --git a/GCDWebServer.xcodeproj/project.pbxproj → ...ebServer Sample.xcodeproj/project.pbxproj b/GCDWebServer.xcodeproj/project.pbxproj → ...ebServer Sample.xcodeproj/project.pbxproj
diff --git a/...ta/xcschemes/GCDWebServers (iOS).xcscheme → ...ta/xcschemes/GCDWebServers (iOS).xcscheme b/...ta/xcschemes/GCDWebServers (iOS).xcscheme → ...ta/xcschemes/GCDWebServers (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,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
-               BuildableName = "GCDWebServers.framework"
-               BlueprintName = "GCDWebServers (iOS)"
-               ReferencedContainer = "container:GCDWebServer.xcodeproj">
+               BuildableName = "GCDWebServer.framework"
+               BlueprintName = "GCDWebServer (iOS)"
+               ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -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)"
-            ReferencedContainer = "container:GCDWebServer.xcodeproj">
+            BuildableName = "GCDWebServer.framework"
+            BlueprintName = "GCDWebServer (iOS)"
+            ReferencedContainer = "container:GCDWebServer Sample.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)"
-            ReferencedContainer = "container:GCDWebServer.xcodeproj">
+            BuildableName = "GCDWebServer.framework"
+            BlueprintName = "GCDWebServer (iOS)"
+            ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -73,9 +69,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "CEE28CEE1AE0051F00F4023C"
-            BuildableName = "GCDWebServers.framework"
-            BlueprintName = "GCDWebServers (iOS)"
-            ReferencedContainer = "container:GCDWebServer.xcodeproj">
+            BuildableName = "GCDWebServer.framework"
+            BlueprintName = "GCDWebServer (iOS)"
+            ReferencedContainer = "container:GCDWebServer Sample.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

diff --git a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme b/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (Mac).xcscheme
diff --git a/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (tvOS).xcscheme b/GCDWebServer.xcodeproj/xcshareddata/xcschemes/GCDWebServers (tvOS).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>