Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.

Commit 1e615b7

Browse files
livecodepanoslivecodepanos
authored
Merge pull request livecode#7213 from livecode/revert-7165-xcode11_support
Revert "Added support for building with Xcode 11 / iOS 13.0 SDK"
2 parents 177356c + 76e0fd8 commit 1e615b7

File tree

8 files changed

+14
-61
lines changed

8 files changed

+14
-61
lines changed

‎Installer/package.txt‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -724,22 +724,6 @@ component Runtime.iOS
724724
file ios:iphonesimulator12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
725725
file ios:iphonesimulator12.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
726726
file ios:iphonesimulator12.1/fontmap as "fontmap"
727-
into "[[ToolsFolder]]/Runtime/iOS/Simulator-13_0" place
728-
executable ios:iphonesimulator13.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphonesimulator8.2/standalone-mobile[[BaseEditionTagLower]].app/standalone-mobile[[BaseEditionTagLower]]
729-
executable ios:iphonesimulator13.0/revsecurity.ios-extension as RevSecurity base ios:iphonesimulator8.2/revsecurity.dylib
730-
executable ios:iphonesimulator13.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphonesimulator8.2/revpdfprinter.dylib
731-
executable ios:iphonesimulator13.0/revzip.ios-extension as RevZip base ios:iphonesimulator8.2/revzip.dylib
732-
executable ios:iphonesimulator13.0/revxml.ios-extension as RevXml base ios:iphonesimulator8.2/revxml.dylib
733-
executable ios:iphonesimulator13.0/revdb.ios-extension as RevDb base ios:iphonesimulator8.2/revdb.dylib
734-
executable ios:iphonesimulator13.0/dbsqlite.ios-extension as DbSqlite base ios:iphonesimulator8.2/dbsqlite.dylib
735-
executable ios:iphonesimulator13.0/dbmysql.ios-extension as DbMysql base ios:iphonesimulator8.2/dbmysql.dylib
736-
file ios:iphonesimulator13.0/mobile-template.plist as "Settings.plist"
737-
file ios:iphonesimulator13.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
738-
file ios:iphonesimulator13.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
739-
file ios:iphonesimulator13.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
740-
file ios:iphonesimulator13.0/mobile-disable-ats-template.plist as "DisableATS.plist"
741-
file ios:iphonesimulator13.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
742-
file ios:iphonesimulator13.0/fontmap as "fontmap"
743727
into "[[ToolsFolder]]/Runtime/iOS/Device-9_2" place
744728
executable ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone
745729
executable ios:iphoneos9.2/revsecurity.ios-extension as RevSecurity
@@ -820,26 +804,6 @@ component Runtime.iOS
820804
file ios:iphoneos12.1/mobile-disable-ats-template.plist as "DisableATS.plist"
821805
file ios:iphoneos12.1/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
822806
file ios:iphoneos12.1/fontmap as "fontmap"
823-
into "[[ToolsFolder]]/Runtime/iOS/Device-13_0" place
824-
executable ios:iphoneos13.0/standalone-mobile[[BaseEditionTagLower]].ios-engine as Standalone base ios:iphoneos9.2/standalone-mobile[[BaseEditionTagLower]].ios-engine
825-
executable ios:iphoneos/revsecurity.ios-extension as RevSecurity base ios:iphoneos9.2/revsecurity.ios-extension
826-
executable ios:iphoneos13.0/revpdfprinter.ios-extension as RevPdfPrinter base ios:iphoneos9.2/revpdfprinter.ios-extension
827-
executable ios:iphoneos13.0/revzip.ios-extension as RevZip base ios:iphoneos9.2/revzip.ios-extension
828-
executable ios:iphoneos13.0/revxml.ios-extension as RevXml base ios:iphoneos9.2/revxml.ios-extension
829-
executable ios:iphoneos13.0/revdb.ios-extension as RevDb base ios:iphoneos9.2/revdb.ios-extension
830-
executable ios:iphoneos13.0/dbsqlite.ios-extension as DbSqlite base ios:iphoneos9.2/dbsqlite.ios-extension
831-
executable ios:iphoneos13.0/dbmysql.ios-extension as DbMysql base ios:iphoneos9.2/dbmysql.ios-extension
832-
file ios:iphoneos13.0/mobile-device-template.plist as "Settings.plist"
833-
file ios:iphoneos13.0/mobile-remote-notification-template.plist as "RemoteNotificationSettings.plist"
834-
file ios:iphoneos13.0/mobile-url-scheme-template.plist as "URLSchemeSettings.plist"
835-
file ios:iphoneos13.0/mobile-splashscreen-template.plist as "SplashscreenSettings.plist"
836-
file ios:iphoneos13.0/template-entitlements.xcent as "Entitlements.xcent"
837-
file ios:iphoneos13.0/template-beta-report-entitlement.xcent as "BetaReportEntitlement.xcent"
838-
file ios:iphoneos13.0/template-remote-notification-entitlements.xcent as "RemoteNotificationEntitlements.xcent"
839-
file ios:iphoneos13.0/template-remote-notification-store-entitlements.xcent as "RemoteNotificationStoreEntitlements.xcent"
840-
file ios:iphoneos13.0/mobile-disable-ats-template.plist as "DisableATS.plist"
841-
file ios:iphoneos13.0/Default-568h@2x.png as "Default4InchSplash.png" base ios:Default-568h@2x.png
842-
file ios:iphoneos13.0/fontmap as "fontmap"
843807

844808
////////////////////////////////////////////////////////////////////////////////
845809

@@ -1016,8 +980,6 @@ component TimeZone
1016980
rfolder ios:iphonesimulator11.2/packaged_extensions/com.livecode.library.timezone/code
1017981
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1018982
rfolder ios:iphonesimulator12.1/packaged_extensions/com.livecode.library.timezone/code
1019-
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1020-
rfolder ios:iphonesimulator13.0/packaged_extensions/com.livecode.library.timezone/code
1021983
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1022984
rfolder ios:iphoneos9.2/packaged_extensions/com.livecode.library.timezone/code
1023985
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
@@ -1026,8 +988,6 @@ component TimeZone
1026988
rfolder ios:iphoneos11.2/packaged_extensions/com.livecode.library.timezone/code
1027989
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1028990
rfolder ios:iphoneos12.1/packaged_extensions/com.livecode.library.timezone/code
1029-
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1030-
rfolder ios:iphoneos13.0/packaged_extensions/com.livecode.library.timezone/code
1031991
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place
1032992
rfolder win-x86:packaged_extensions/com.livecode.library.timezone/code
1033993
into [[ToolsFolder]]/Extensions/com.livecode.library.timezone place

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 12.1 13.0
29-
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 12.1 13.0
28+
IPHONEOS_VERSIONS ?= 9.2 10.2 11.2 12.1
29+
IPHONESIMULATOR_VERSIONS ?= 8.2 9.2 10.2 11.2 12.1
3030
SKIP_IPHONESIMULATOR_VERSIONS ?= 6.1 7.1
3131

3232
IOS_SDKS ?= \

‎config.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@
3131
'x86-android-ndk16r15',
3232
'x86_64-android-ndk16r15',
3333
'universal-mac-macosx10.9', # Minimum deployment target
34-
'universal-ios-iphoneos13.0',
3534
'universal-ios-iphoneos12.1',
3635
'universal-ios-iphoneos11.2',
3736
'universal-ios-iphoneos10.2',
3837
'universal-ios-iphoneos9.2',
39-
'universal-ios-iphonesimulator13.0',
4038
'universal-ios-iphonesimulator12.1',
4139
'universal-ios-iphonesimulator11.2',
4240
'universal-ios-iphonesimulator10.2',

‎docs/notes-base/platforms.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ Currently, the supported versions of Xcode are:
6262
* Xcode 8.2 on MacOS X 10.11
6363
* Xcode 9.2 on MacOS 10.12 (Note: You need to upgrade to 10.12.6)
6464
* Xcode 10.1 on MacOS 10.13 (Note: You need to upgrade to 10.13.4)
65-
* Xcode 11.0 on MacOS 10.14 (Note: You need to upgrade to 10.14.3)
6665

6766
It is also possible to set other versions of Xcode, to allow testing
6867
on a wider range of iOS simulators. For instance, on MacOS 10.12
@@ -76,7 +75,6 @@ We currently support deployment for the following versions of iOS:
7675
* 10.2
7776
* 11.2
7877
* 12.1
79-
* 13.0
8078

8179
## Android
8280

‎ide-support/revdeploylibraryios.livecodescript‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,18 @@ local sDeviceSDKs
1818
-- SN-2015-03-24: [[ Bug 15037 ]] Add a consistent, strict list of the
1919
-- SDKs and device relying on the engines we provide in the shipped version
2020
function deployUsableIosSdk
21-
return "8.2,9.2,10.2,11.2,12.1,13.0"
21+
return "8.2,9.2,10.2,11.2,12.1"
2222
end deployUsableIosSdk
2323

2424
// SN-2015-05-01: Return the pair iOS SDK / Xcode for the current MacOS version
2525
function deployGetIphoneOSes
2626
local tList, tMacVersion
2727
put deploySanitizeSystemVersion() into tMacVersion
28-
if tMacVersion < 101000 then
28+
if tMacVersion < 100800 then
29+
put "6.1,4.6" into tList[1]
30+
else if tMacVersion < 100900 then
31+
put "7.1,5.1" into tList[1]
32+
else if tMacVersion < 101000 then
2933
put "8.2,6.2" into tList[1]
3034
else if tMacVersion < 101100 then
3135
put "8.2,6.2" into tList[1]
@@ -40,24 +44,19 @@ function deployGetIphoneOSes
4044
answer error "To use Xcode 9.2, you need to upgrade your Mac to MacOS Sierra 10.12.6"
4145
else if tMacVersion < 101300 then
4246
put "11.2,9.2" into tList[1]
43-
else if tMacVersion < 101304 then
47+
else if tMacVersion < 101302 then
4448
put empty into tList[1]
4549
answer error "To use Xcode 10.1, you need to upgrade your Mac to MacOS High Sierra 10.13.4"
46-
else if tMacVersion < 101400 then
47-
put "12.1,10.1" into tList[1]
48-
else if tMacVersion < 101403 then
49-
put empty into tList[1]
50-
answer error "To use Xcode 11.0, you need to upgrade your Mac to MacOS Mojave 10.14.3"
5150
else
52-
// Xcode 11.0 requires a Mac running Mac OS 10.14.3 or later
51+
// Xcode 10.1 requires a Mac running Mac OS 10.13.4 or later
5352
put "12.1,10.1" into tList[1]
5453
end if
5554

5655
return tList
5756
end deployGetIphoneOSes
5857

5958
function deployGetIosMinimumVersions
60-
return "8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3,10.0,10.1,10.2,10.3,11.0,11.1,11.2,11.3,11.4,12.0,12.1,13.0"
59+
return "8.0,8.1,8.2,8.3,8.4,9.0,9.1,9.2,9.3,10.0,10.1,10.2,10.3,11.0,11.1,11.2,11.3,11.4,12.0,12.1"
6160
end deployGetIosMinimumVersions
6261

6362
////////////////////////////////////////////////////////////////////////////////

‎prebuilt/fetch-libraries.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ LIBS_win32=( Thirdparty OpenSSL Curl ICU CEF )
1515
LIBS_linux=( Thirdparty OpenSSL Curl ICU CEF )
1616
LIBS_emscripten=( Thirdparty ICU )
1717

18-
SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneSimulator13.0 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1 iPhoneOS13.0)
18+
SUBPLATFORMS_ios=(iPhoneSimulator8.2 iPhoneSimulator9.2 iPhoneSimulator10.2 iPhoneSimulator11.2 iPhoneSimulator12.1 iPhoneOS9.2 iPhoneOS10.2 iPhoneOS11.2 iPhoneOS12.1)
1919
SUBPLATFORMS_win32=(v141_static_debug v141_static_release)
2020
SUBPLATFORMS_android=(ndk16r15)
2121

‎prebuilt/scripts/ios.inc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,3 @@ checkiOS iphonesimulator11.2 9_2_0 iPhoneSimulator 11.2 "x86_64"
7777
checkiOS iphoneos11.2 9_2_0 iPhoneOS 11.2 "armv7 arm64"
7878
checkiOS iphonesimulator12.1 10_1_0 iPhoneSimulator 12.1 "x86_64"
7979
checkiOS iphoneos12.1 10_1_0 iPhoneOS 12.1 "armv7 arm64"
80-
checkiOS iphonesimulator13.0 11_0_0 iPhoneSimulator 13.0 "x86_64"
81-
checkiOS iphoneos13.0 11_0_0 iPhoneOS 13.0 "armv7 arm64"

‎tools/setup_xcode_sdks.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/python
22

33
# Update these lists if you need different SDK versions!
4-
iphoneos_versions = ["13.0", "12.1", "11.2", "10.2", "9.2"]
5-
iphonesimulator_versions = ["13.0", "12.1", "11.2", "10.2","9.2", "8.2"]
4+
iphoneos_versions = ["12.1", "11.2", "10.2", "9.2"]
5+
iphonesimulator_versions = ["12.1", "11.2", "10.2","9.2", "8.2"]
66
macosx_versions = ["10.9"]
77

88

0 commit comments

Comments
 (0)