Merge remote-tracking branch 'upstream/develop-6.7' into merge-develop-6.7-29.03.2016

livecodepanos · livecodepanos · commit 3a42bdccfcc3 · 2016-03-29T17:36:14.000+01:00
diff --git a/Makefile b/Makefile
@@ -24,8 +24,8 @@ WINE ?= wine
 
 # Some magic to control which versions of iOS we try to build.  N.b. you may
 # also need to modify the buildbot configuration
-IPHONEOS_VERSIONS ?= 8.2 8.4 9.2
-IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.4 9.2
+IPHONEOS_VERSIONS ?= 8.2 9.2 9.3
+IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 9.2 9.3
 
 IOS_SDKS ?= \
 	$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
diff --git a/docs/notes/platforms.md b/docs/notes/platforms.md
@@ -61,8 +61,8 @@ Currently, the supported versions of Xcode are:
 *Xcode 4.6 on MacOS X 10.7
 *Xcode 5.1 on MacOS X 10.8
 *Xcode 6.2 on MacOS X 10.9
-*Xcode 6.2, 6.4 and 7.2 on Mac OS X 10.10
-*Xcode 7.2 on MacOS X 10.11
+*Xcode 6.2 and 7.2 on Mac OS X 10.10
+*Xcode 7.3 on MacOS X 10.11
 
 It is also possible to set other versions of Xcode, to allow testing on a wider range of iOS simulators. For instance, on Yosemite, you can add *Xcode 5.1* in the *Mobile Support* preferences, to let you test your stack on the *iOS Simulator 7.1*.
 
@@ -71,8 +71,8 @@ We currently support the following iOS Simulators:
 *6.1
 *7.1
 *8.2
-*8.4
 *9.2
+*9.3
 
 ## Android
 LiveCode allows you to save your stack as an Android application, and also to deploy it on an Android device or simulator from the IDE.
diff --git a/ide-support/revdeploylibraryios.livecodescript b/ide-support/revdeploylibraryios.livecodescript
@@ -17,9 +17,8 @@ local sDeviceSDKs
 
 -- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
 --  SDKs and device relying on the engines we provide in the shipped version
--- SN-2015-05-01: [[ Xcode 6.4 ]] Add iOS 8.4 amongst the uable iOS SDK
 function deployUsableIosSdk
-   return "5.1,6.1,7.1,8.2,8.4,9.2"
+   return "5.1,6.1,7.1,8.2,9.2,9.3"
 end deployUsableIosSdk
 
 // SN-2015-05-01: [[ Xcode 6.4 ]] Return the pair iOS SDK / Xcode for the current MacOS version
@@ -33,21 +32,21 @@ function deployGetIphoneOSes
    else if tMacVersion < 101000 then
       put "8.2,6.2" into tList[1]
    else if tMacVersion < 101100 then
-      put "8.4,6.4" into tList[1]
-      put "8.2,6.2" into tList[2]
+      put "8.2,6.2" into tList[1]
       // Xcode 7.0 can be installed from Mac OSX 10.10.4 onwards
       if tMacVersion >= 101004 then
-         put "9.2,7.1" into tList[3]
+         put "9.2,7.2" into tList[2]
       end if
    else
-      put "9.2,7.1" into tList[1]
+   	  // Xcode 7.3 requires a Mac running OS X 10.11 or later
+      put "9.3,7.3" into tList[1]
    end if
    
    return tList
 end deployGetIphoneOSes
 
 function deployGetIosMinimumVersions
-   return "5.1.1,6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2"
+   return "5.1.1,6.0,6.1,7.0,7.1,8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3"
 end deployGetIosMinimumVersions
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/tools/setup_xcode_sdks.sh b/tools/setup_xcode_sdks.sh
@@ -2,8 +2,8 @@
 
 # Update these lists if you need different SDK versions!
 
-iphoneos_versions="9.2 8.4 8.2"
-iphonesimulator_versions="9.2 8.4 8.2 7.1 6.1 5.1"
+iphoneos_versions="9.3 9.2 8.2"
+iphonesimulator_versions="9.3 9.2 8.2 7.1 6.1 5.1"
 macosx_versions="10.8 10.6"
 
 # This tool creates the symlinks required for Xcode builds of LiveCode.
