Removing modulemaps which were overriding framework headers

Frameworks/macIcecast.framework/Versions/A/Resources/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19C57</string>
+	<string>19D76</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

Frameworks/macIcecast.framework/Versions/A/_CodeSignature/CodeResources

@@ -6,7 +6,7 @@
 	<dict>
 		<key>Resources/Info.plist</key>
 		<data>
-		nJawphwNT9kpKYLvqPy3Fmr7RCM=
+		le7ZdQHs1HFRcB5psdOli2Fla14=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -44,17 +44,6 @@
 			NDRLpk5xHszkwtmR1bm9cUrUB8DmdyM/7jGFTbMM9Uc=
 			</data>
 		</dict>
-		<key>Modules/module.modulemap</key>
-		<dict>
-			<key>hash</key>
-			<data>
-			houecoEXK7NydNB6Q6sF0dz8Jlo=
-			</data>
-			<key>hash2</key>
-			<data>
-			ZceCkKjae4ZDDG0OWcFo4fKF57QJnxEwbpcLjDoj2DM=
-			</data>
-		</dict>
 		<key>PrivateHeaders/codec.h</key>
 		<dict>
 			<key>hash</key>
@@ -103,11 +92,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			nJawphwNT9kpKYLvqPy3Fmr7RCM=
+			le7ZdQHs1HFRcB5psdOli2Fla14=
 			</data>
 			<key>hash2</key>
 			<data>
-			8hgNW5ix90tPPZk+7jGzrDUcrSRlIhAwvl2CqR/J7LI=
+			DcT0Kl/XHlhgij4ImfytMG6z6GyOJye7gEl1j/Himek=
 			</data>
 		</dict>
 	</dict>

Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 </dict>

aIcecast.xcodeproj/project.pbxproj

@@ -729,9 +729,6 @@
 		6896F6AF23BB3984006F43E5 /* iosIcecast.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = iosIcecast.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		68E0A04721DA0AA500C581B8 /* Icecast.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Icecast.h; sourceTree = "<group>"; };
 		68E802C721C2BA460010A9F9 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
-		68ED611323E19E150036E9A1 /* module-macOS.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = "module-macOS.modulemap"; sourceTree = "<group>"; };
-		68ED611423E19F7F0036E9A1 /* module-iOS.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = "module-iOS.modulemap"; sourceTree = "<group>"; };
-		68ED611523E19F7F0036E9A1 /* module-iOS64.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = "module-iOS64.modulemap"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -1104,9 +1101,6 @@
 				68E802C721C2BA460010A9F9 /* PrefixHeader.pch */,
 				68E0A04721DA0AA500C581B8 /* Icecast.h */,
 				6888ECD623BDE39500EB7F17 /* Info.plist */,
-				68ED611323E19E150036E9A1 /* module-macOS.modulemap */,
-				68ED611423E19F7F0036E9A1 /* module-iOS.modulemap */,
-				68ED611523E19F7F0036E9A1 /* module-iOS64.modulemap */,
 				6888ECDB23BDE3C700EB7F17 /* sources */,
 				68E802BC21C2B9CC0010A9F9 /* Products */,
 			);
@@ -1878,7 +1872,8 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "module-iOS64.modulemap";
+				MARKETING_VERSION = 1.0.1;
+				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = "-fembed-bitcode";
 				PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
 				PRODUCT_BUNDLE_IDENTIFIER = net.cloudfields.Icecast;
@@ -1921,7 +1916,8 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "module-iOS64.modulemap";
+				MARKETING_VERSION = 1.0.1;
+				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = "-fembed-bitcode";
 				PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
 				PRODUCT_BUNDLE_IDENTIFIER = net.cloudfields.Icecast;
@@ -2122,7 +2118,8 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MODULEMAP_FILE = "module-macOS.modulemap";
+				MARKETING_VERSION = 1.0.1;
+				MODULEMAP_FILE = "";
 				PRODUCT_BUNDLE_IDENTIFIER = net.cloudfields.Icecast;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -2159,7 +2156,8 @@
 				);
 				MACH_O_TYPE = staticlib;
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				MODULEMAP_FILE = "module-macOS.modulemap";
+				MARKETING_VERSION = 1.0.1;
+				MODULEMAP_FILE = "";
 				PRODUCT_BUNDLE_IDENTIFIER = net.cloudfields.Icecast;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
@@ -2198,7 +2196,8 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "module-iOS.modulemap";
+				MARKETING_VERSION = 1.0.1;
+				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = "-fembed-bitcode";
 				PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
 				PRODUCT_BUNDLE_IDENTIFIER = net.cloudfields.Icecast;
@@ -2240,7 +2239,8 @@
 					"@loader_path/Frameworks",
 				);
 				MACH_O_TYPE = staticlib;
-				MODULEMAP_FILE = "module-iOS.modulemap";
+				MARKETING_VERSION = 1.0.1;
+				MODULEMAP_FILE = "";
 				OTHER_CFLAGS = "-fembed-bitcode";
 				PLIST_FILE_OUTPUT_FORMAT = "same-as-input";
 				PRODUCT_BUNDLE_IDENTIFIER = net.cloudfields.Icecast;