Drop support for iOS 9.2

livecodepanos · livecodepanos · commit 52c2606d9944 · 2019-11-20T10:12:41.000+02:00
diff --git a/Installer/package.txt b/Installer/package.txt
diff --git a/Makefile b/Makefile
@@ -25,9 +25,11 @@ EMMAKE ?= emmake
 
 # 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 ?= 9.2 10.2 11.2 12.1 13.1
-IPHONESIMULATOR_VERSIONS ?= 9.2 10.2 11.2 12.1 13.1
-SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2
+IPHONEOS_VERSIONS ?= 10.2 11.2 12.1 13.1
+IPHONESIMULATOR_VERSIONS ?= 10.2 11.2 12.1 13.1
+SKIP_IPHONEOS_VERSIONS ?= 9.2
+SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1 8.2 9.2
+
 
 IOS_SDKS ?= \
 	$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
@@ -210,13 +212,20 @@ compile-ios-%:
 check-ios-%:
 	$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE) -target check
 
-# Dummy targets to prevent our build system from building old iOS simulators
+# Dummy targets to prevent our build system from building old iOS simulators+devices
 $(addprefix config-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
 	@echo "Skipping $@ (no longer supported)"
 $(addprefix compile-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
 	@echo "Skipping $@ (no longer supported)"
 $(addprefix check-ios-iphonesimulator,$(SKIP_IPHONESIMULATOR_VERSIONS)):
 	@echo "Skipping $@ (no longer supported)"
+	
+$(addprefix config-ios-iphonesimulator,$(SKIP_IPHONEOS_VERSIONS)):
+	@echo "Skipping $@ (no longer supported)"
+$(addprefix compile-ios-iphonesimulator,$(SKIP_IPHONEOS_VERSIONS)):
+	@echo "Skipping $@ (no longer supported)"
+$(addprefix check-ios-iphonesimulator,$(SKIP_IPHONEOS_VERSIONS)):
+	@echo "Skipping $@ (no longer supported)"
 
 # Provide some synonyms for "latest iOS SDK"
 $(addsuffix -ios-iphoneos,all config compile check): %: %$(lastword $(IPHONEOS_VERSIONS))
diff --git a/config.py b/config.py
@@ -35,12 +35,10 @@
     'universal-ios-iphoneos12.1',
     'universal-ios-iphoneos11.2',
     'universal-ios-iphoneos10.2',
-    'universal-ios-iphoneos9.2',
     'universal-ios-iphonesimulator13.1',
     'universal-ios-iphonesimulator12.1',
     'universal-ios-iphonesimulator11.2',
     'universal-ios-iphonesimulator10.2',
-    'universal-ios-iphonesimulator9.2',
     'x86-win32', # TODO[2017-03-23] More specific ABI
     'x86_64-win32',
     'js-emscripten-sdk1.35',
diff --git a/docs/notes-base/platforms.md b/docs/notes-base/platforms.md
@@ -57,20 +57,18 @@ The Mac engine supports:
 iOS deployment is possible when running LiveCode IDE on a Mac, and provided Xcode is installed and has been set in LiveCode *Preferences* (in the *Mobile Support* pane).
 
 Currently, the supported versions of Xcode are:
-* Xcode 7.2 on Mac OS X 10.10
 * Xcode 8.2 on MacOS X 10.11
 * Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
 * Xcode 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
 * Xcode 11.1 on MacOS 10.14 (Note: You need to upgrade to 10.14.3) 
 
 It is also possible to set other versions of Xcode, to allow testing
 on a wider range of iOS simulators. For instance, on MacOS 10.12
-(Sierra), you can add *Xcode 6.2* in the *Mobile Support* preferences,
-to let you test your stack on the *iOS Simulator 8.2*.
+(Sierra), you can add *Xcode 8.2* in the *Mobile Support* preferences,
+to let you test your stack on the *iOS Simulator 10.2*.
 
 We currently support deployment for the following versions of iOS:
 
-* 9.2
 * 10.2
 * 11.2
 * 12.1
diff --git a/ide-support/revdeploylibraryios.livecodescript b/ide-support/revdeploylibraryios.livecodescript
@@ -18,18 +18,16 @@ 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
 function deployUsableIosSdk
-   return "9.2,10.2,11.2,12.1,13.1"
+   return "10.2,11.2,12.1,13.1"
 end deployUsableIosSdk
 
 // SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
 function deployGetIphoneOSes
    local tList, tMacVersion
    put deploySanitizeSystemVersion() into tMacVersion
-   // Xcode 7.2 can be installed from Mac OSX 10.10.5 onwards
-   if tMacVersion < 101005 then
-      answer error "To deploy to an iOS device or simulator, you need to upgrade your Mac to at least Mac OSX 10.10.5"
-   else if tMacVersion < 101100 then
-      put "9.2,7.2" into tList[1]
+   // Xcode 8.2 can be installed from Mac OSX 10.11.0 onwards
+   if tMacVersion < 101100 then
+      answer error "To deploy to an iOS device or simulator, you need to upgrade your Mac to at least Mac OSX 10.11.0"
    else if tMacVersion < 101200 then
       put "10.2,8.2" into tList[1]
    else if tMacVersion < 101206 then
diff --git a/prebuilt/fetch-libraries.sh b/prebuilt/fetch-libraries.sh
@@ -15,7 +15,7 @@ LIBS_win32=( Thirdparty OpenSSL Curl ICU CEF )
 LIBS_linux=( Thirdparty OpenSSL Curl ICU CEF )
 LIBS_emscripten=( Thirdparty ICU )
 
-SUBPLATFORMS_ios=(iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.1 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.1)
+SUBPLATFORMS_ios=(iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.1 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.1)
 SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
 SUBPLATFORMS_android=(ndk16r15)
 
diff --git a/prebuilt/scripts/ios.inc b/prebuilt/scripts/ios.inc
@@ -68,8 +68,6 @@ else
 fi
 
 # Detect iOS variants
-checkiOS iphonesimulator9.2 7_2_1 iPhoneSimulator 9.2 "i386 x86_64"
-checkiOS iphoneos9.2 7_2_1 iPhoneOS 9.2 "armv7 arm64"
 checkiOS iphonesimulator10.2 8_2_0 iPhoneSimulator 10.2 "i386 x86_64"
 checkiOS iphoneos10.2 8_2_0 iPhoneOS 10.2 "armv7 arm64"
 checkiOS iphonesimulator11.2 9_2_0 iPhoneSimulator 11.2 "x86_64"
diff --git a/tools/setup_xcode_sdks.py b/tools/setup_xcode_sdks.py
@@ -1,8 +1,8 @@
 #!/bin/python
 
 # Update these lists if you need different SDK versions!
-iphoneos_versions = ["13.1", "12.1", "11.2", "10.2", "9.2"]
-iphonesimulator_versions = ["13.1", "12.1", "11.2", "10.2", "9.2"]
+iphoneos_versions = ["13.1", "12.1", "11.2", "10.2"]
+iphonesimulator_versions = ["13.1", "12.1", "11.2", "10.2"]
 macosx_versions = ["10.9"]
 
 
