diff --git a/Make.config b/Make.config index 57462c6e4e32..ba5f835160ae 100644 --- a/Make.config +++ b/Make.config @@ -79,6 +79,7 @@ TVOS_SDK_VERSION=10.0 MIN_IOS_SDK_VERSION=6.0 MIN_OSX_SDK_VERSION=10.7 MIN_WATCHOS_SDK_VERSION=2.0 +MIN_WATCH_OS_VERSION=1.0 MIN_TVOS_SDK_VERSION=9.0 INCLUDE_IOS=1 diff --git a/Makefile b/Makefile index 153b3f5c3646..356d74866696 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/updateinfo: Make.config $(Q) echo "4569c276-1397-4adb-9485-82a7696df22e $(IOS_PACKAGE_UPDATE_ID)" > $@ $(IOS_DESTDIR)/$(MONOTOUCH_PREFIX)/Versions.plist: Versions-ios.plist.in Makefile $(TOP)/Make.config versions-check.csharp - $(Q) ./versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCHOS_SDK_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)" + $(Q) ./versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)" $(Q_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' $< > $@ ifdef INCLUDE_IOS @@ -105,7 +105,7 @@ $(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/Version: Make.config $(Q) echo $(MAC_PACKAGE_VERSION) > $@ $(MAC_DESTDIR)/$(MAC_FRAMEWORK_CURRENT_DIR)/Versions.plist: Versions-mac.plist.in Makefile $(TOP)/Make.config versions-check.csharp - $(Q) ./versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCHOS_SDK_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)" + $(Q) ./versions-check.csharp $< "$(MIN_IOS_SDK_VERSION)" "$(IOS_SDK_VERSION)" "$(MIN_TVOS_SDK_VERSION)" "$(TVOS_SDK_VERSION)" "$(MIN_WATCH_OS_VERSION)" "$(WATCH_SDK_VERSION)" "$(MIN_OSX_SDK_VERSION)" "$(OSX_SDK_VERSION)" $(Q_GEN) sed -e 's/@XCODE_VERSION@/$(XCODE_VERSION)/g' $< > $@ ifdef INCLUDE_MAC diff --git a/Versions-ios.plist.in b/Versions-ios.plist.in index e655c51ec63a..9865dd5b638b 100644 --- a/Versions-ios.plist.in +++ b/Versions-ios.plist.in @@ -31,6 +31,7 @@ watchOS + 1.0 2.0 2.1 2.2 @@ -61,7 +62,7 @@ com.apple.widget-extension 8.0 com.apple.watchkit - 8.0 + 8.2 com.apple.AudioUnit-UI 8.0 com.apple.Safari.content-blocker @@ -91,7 +92,10 @@ 9.0 watchOS - + + com.apple.watchkit + 2.0 + diff --git a/versions-check.csharp b/versions-check.csharp index bdda4004a804..99be081488a2 100755 --- a/versions-check.csharp +++ b/versions-check.csharp @@ -48,10 +48,10 @@ var check = new Action ((product, min, max) => var v = node.InnerText; var version = Version.Parse (v); if (version < minVersion) { - Console.Error.WriteLine ($"Found the {product} version {v} in {Path.GetFileName (plistPath)}, but it's smaller the supported min {product} version we support ({min})."); + Console.Error.WriteLine ($"Found the {product} version {v} in {Path.GetFileName (plistPath)}, but it's smaller than the supported min {product} version we support ({min})."); failed = true; } else if (version > maxVersion) { - Console.Error.WriteLine ($"Found the {product} version {v} in {Path.GetFileName (plistPath)}, but it's higher the supported max {product} version we support ({max})."); + Console.Error.WriteLine ($"Found the {product} version {v} in {Path.GetFileName (plistPath)}, but it's higher than the supported max {product} version we support ({max})."); failed = true; } else if (version == maxVersion) { foundMax = true;