fix bitcode settings; bump minimum iOS vers to 9.0

emaloney · Mar 9, 2017 · 1e5dff6 · 1e5dff6
1 parent 2065632
commit 1e5dff6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/BuildControl/config/Project.xcconfig b/BuildControl/config/Project.xcconfig
@@ -5,22 +5,21 @@ TARGETED_DEVICE_FAMILY = 1,2,3,4
 //
 // iOS-specific settings
 //
-IPHONEOS_DEPLOYMENT_TARGET = 8.0
+IPHONEOS_DEPLOYMENT_TARGET = 9.0
 
 VALID_ARCHS[sdk=iphoneos*] = arm64 armv7 armv7s
 VALID_ARCHS[sdk=iphonesimulator*] = i386 x86_64
 
 LD_RUNPATH_SEARCH_PATHS[sdk=iphoneos*] =  @executable_path/Frameworks @loader_path/Frameworks
 LD_RUNPATH_SEARCH_PATHS[sdk=iphonesimulator*] =  @executable_path/Frameworks @loader_path/Frameworks
 
-ENABLE_BITCODE[sdk=iphonesimulator*] = YES
 ENABLE_BITCODE[sdk=iphone*] = YES
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // macOS-specific settings
 //
-MACOSX_DEPLOYMENT_TARGET = 10.10
+MACOSX_DEPLOYMENT_TARGET = 10.11
 
 VALID_ARCHS[sdk=macosx*] = i386 x86_64
 
@@ -40,7 +39,6 @@ VALID_ARCHS[sdk=appletvsimulator*] = x86_64
 LD_RUNPATH_SEARCH_PATHS[sdk=appletvos*] =  @executable_path/Frameworks @loader_path/Frameworks
 LD_RUNPATH_SEARCH_PATHS[sdk=appletvsimulator*] =  @executable_path/Frameworks @loader_path/Frameworks
 
-ENABLE_BITCODE[sdk=appletvsimulator*] = YES
 ENABLE_BITCODE[sdk=appletv*] = YES
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -55,5 +53,4 @@ VALID_ARCHS[sdk=watchsimulator*] = i386
 LD_RUNPATH_SEARCH_PATHS[sdk=watchos*] =  @executable_path/Frameworks @loader_path/Frameworks
 LD_RUNPATH_SEARCH_PATHS[sdk=watchsimulator*] =  @executable_path/Frameworks @loader_path/Frameworks
 
-ENABLE_BITCODE[sdk=watchsimulator*] = YES
 ENABLE_BITCODE[sdk=watch*] = YES
diff --git a/BuildControl/repos.xml b/BuildControl/repos.xml
@@ -40,9 +40,15 @@
 		<Var literal="master"/>
 	</Var>
 
-	<Var name="xcode:version" type="dynamic" expression="$versions[$repo:branch][Xcode]"/>
-	<Var name="swift:version" type="dynamic" expression="$versions[$repo:branch][Swift]"/>
-	<Var name="project:travisImage" type="dynamic" expression="$versions[$repo:branch][Travis]"/>
+	<Var name="branchForVersions" type="dynamic" expression="^if($versions[$repo:branch]|$repo:branch|master)"/> 
+
+	<Var name="xcode:version" type="dynamic" expression="$versions[$branchForVersions][Xcode]"/>
+	<Var name="swift:version" type="dynamic" expression="$versions[$branchForVersions][Swift]"/>
+	<Var name="iOS:version:minimum" type="dynamic" expression="$versions[$branchForVersions][minimum][iOS]"/>
+	<Var name="macOS:version:minimum" type="dynamic" expression="$versions[$branchForVersions][minimum][macOS]"/>
+	<Var name="tvOS:version:minimum" type="dynamic" expression="$versions[$branchForVersions][minimum][tvOS]"/>
+	<Var name="watchOS:version:minimum" type="dynamic" expression="$versions[$branchForVersions][minimum][watchOS]"/>
+	<Var name="project:travisImage" type="dynamic" expression="$versions[$branchForVersions][Travis]"/>
 
 	<Var name="versions" type="map">
 		<!-- master branch declarations -->
@@ -61,8 +67,8 @@
 			</Var>
 
 			<Var name="minimum" type="map">
-				<Var name="iOS" literal="8.0"/> 
-				<Var name="macOS" literal="10.10"/> 
+				<Var name="iOS" literal="9.0"/> 
+				<Var name="macOS" literal="10.11"/> 
 				<Var name="tvOS" literal="9.0"/> 
 				<Var name="watchOS" literal="2.0"/> 
 			</Var>

diff --git a/INTEGRATION.md b/INTEGRATION.md
@@ -9,8 +9,8 @@ CleanroomBridging is designed as a *universal Swift framework* with support for
 
 Platform|Latest supported OS|Oldest supported OS
 --------|-------------------|-------------------
-iPhone/iPad|iOS 10.2|iOS 8.0
-Macintosh|macOS 10.12|macOS 10.10
+iPhone/iPad|iOS 10.2|iOS 9.0
+Macintosh|macOS 10.12|macOS 10.11
 Apple TV|tvOS 10.1|tvOS 9.0
 Apple Watch|watchOS 3.1|watchOS 2.0