From 6f7acf8ace8209c8583346ba8887ce3082571a9a Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Mon, 6 May 2024 15:02:43 +0200 Subject: [PATCH 1/5] chore(common): Add `minimum-versions.inc.sh` This file contains the minimal required versions as discussed for Keyman 18. Implements #11371. --- resources/build/minimum-versions.inc.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 resources/build/minimum-versions.inc.sh diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh new file mode 100644 index 00000000000..e24ff7e8c7d --- /dev/null +++ b/resources/build/minimum-versions.inc.sh @@ -0,0 +1,23 @@ +# Required minimum versions (also used as default version) +# Minimum versions as of Keyman 18 +# (https://docs.google.com/document/d/1Uy3U2YXeA4rCEbUbT7O6QzUGJDZBeViFecL8fjUOLkE/edit?usp=sharing) + +# shellcheck shell=bash disable=SC2034 # SC2034: X appears unused. + +MIN_NODE_MAJOR_VERSION=18 +MIN_EMSCRIPTEN_VERSION=3.1.44 # 3.1.45 has problems, newer versions will work + +MIN_VISUAL_STUDIO_VERSION=2019 +MIN_MESON_VERSION=1.0.0 +MIN_CHROME_VERSION=95.0 + +MIN_ANDROID_VERSION=5 +MIN_IOS_VERSION=12.2 +MIN_WINDOWS_VERSION=10 # Windows 10 +MIN_MACOS_VERSION=10.13 # MacOS 10.13 (High Sierra) +MIN_UBUNTU_VERSION=20.04 # Ubuntu 20.04 Focal + +# We're using Java/OpenJDK 11 +KEYMAN_JAVA_VERSION=11 + +DEFAULT_UBUNTU_VERSION=noble From 29952f272d1530ae788a1081aae7512c7333e151 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Tue, 7 May 2024 15:57:41 +0200 Subject: [PATCH 2/5] Update resources/build/minimum-versions.inc.sh Co-authored-by: Joshua Horton --- resources/build/minimum-versions.inc.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh index e24ff7e8c7d..80ad8eaf5dd 100644 --- a/resources/build/minimum-versions.inc.sh +++ b/resources/build/minimum-versions.inc.sh @@ -12,6 +12,7 @@ MIN_MESON_VERSION=1.0.0 MIN_CHROME_VERSION=95.0 MIN_ANDROID_VERSION=5 +MIN_ANDROID_SDK_VERSION=21 MIN_IOS_VERSION=12.2 MIN_WINDOWS_VERSION=10 # Windows 10 MIN_MACOS_VERSION=10.13 # MacOS 10.13 (High Sierra) From d00ef82369c0c0166f740e7584701311f470ab5a Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Tue, 7 May 2024 16:05:49 +0200 Subject: [PATCH 3/5] chore(common): Apply suggestions from code review --- resources/build/minimum-versions.inc.sh | 35 ++++++++++++++----------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh index 80ad8eaf5dd..f9478596ef8 100644 --- a/resources/build/minimum-versions.inc.sh +++ b/resources/build/minimum-versions.inc.sh @@ -4,21 +4,26 @@ # shellcheck shell=bash disable=SC2034 # SC2034: X appears unused. -MIN_NODE_MAJOR_VERSION=18 -MIN_EMSCRIPTEN_VERSION=3.1.44 # 3.1.45 has problems, newer versions will work +# Target operating system and platform versions +KEYMAN_MIN_TARGET_VERSION_ANDROID=5 # Lollipop +KEYMAN_MIN_TARGET_VERSION_IOS=12.2 # iOS 12.2 +KEYMAN_MIN_TARGET_VERSION_WINDOWS=10 # Windows 10 +KEYMAN_MIN_TARGET_VERSION_MAC=10.13 # MacOS 10.13 (High Sierra) +KEYMAN_MIN_TARGET_VERSION_UBUNTU=20.04 # Ubuntu 20.04 Focal +KEYMAN_MIN_TARGET_VERSION_CHROME=95.0 # Final version that runs on Android 5.0 -MIN_VISUAL_STUDIO_VERSION=2019 -MIN_MESON_VERSION=1.0.0 -MIN_CHROME_VERSION=95.0 +# Dependency versions +KEYMAN_MIN_VERSION_NODE_MAJOR=18 +KEYMAN_MIN_VERSION_NPM=10.5.1 # 10.5.0 has bug, discussed in #10350 +KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.44 # Warning: 3.1.45 is bad (#9529); newer versions work +KEYMAN_MAX_VERSION_EMSCRIPTEN=3.1.58 # See #9529 +KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019 +KEYMAN_MIN_VERSION_MESON=1.0.0 -MIN_ANDROID_VERSION=5 -MIN_ANDROID_SDK_VERSION=21 -MIN_IOS_VERSION=12.2 -MIN_WINDOWS_VERSION=10 # Windows 10 -MIN_MACOS_VERSION=10.13 # MacOS 10.13 (High Sierra) -MIN_UBUNTU_VERSION=20.04 # Ubuntu 20.04 Focal +# Language and runtime versions +KEYMAN_MIN_VERSION_JAVA=11 # We're using Java/OpenJDK 11 +KEYMAN_MIN_VERSION_CPP=17 # C++17 +KEYMAN_MIN_VERSION_ANDROID_SDK=21 -# We're using Java/OpenJDK 11 -KEYMAN_JAVA_VERSION=11 - -DEFAULT_UBUNTU_VERSION=noble +# Default version used in Docker containers +KEYMAN_DEFAULT_VERSION_CONTAINER=noble # Ubuntu 24.04 Noble From 096a011faf2a8e87b8ec8d9a12a576e61e07d22f Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 8 May 2024 10:55:08 +0200 Subject: [PATCH 4/5] chore(common): Apply suggestion from code review --- resources/build/minimum-versions.inc.sh | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh index f9478596ef8..434ff11eead 100644 --- a/resources/build/minimum-versions.inc.sh +++ b/resources/build/minimum-versions.inc.sh @@ -5,25 +5,25 @@ # shellcheck shell=bash disable=SC2034 # SC2034: X appears unused. # Target operating system and platform versions -KEYMAN_MIN_TARGET_VERSION_ANDROID=5 # Lollipop -KEYMAN_MIN_TARGET_VERSION_IOS=12.2 # iOS 12.2 -KEYMAN_MIN_TARGET_VERSION_WINDOWS=10 # Windows 10 -KEYMAN_MIN_TARGET_VERSION_MAC=10.13 # MacOS 10.13 (High Sierra) -KEYMAN_MIN_TARGET_VERSION_UBUNTU=20.04 # Ubuntu 20.04 Focal -KEYMAN_MIN_TARGET_VERSION_CHROME=95.0 # Final version that runs on Android 5.0 +KEYMAN_MIN_TARGET_VERSION_ANDROID=5 # Lollipop +KEYMAN_MIN_TARGET_VERSION_IOS=12.2 # iOS 12.2 +KEYMAN_MIN_TARGET_VERSION_WINDOWS=10 # Windows 10 +KEYMAN_MIN_TARGET_VERSION_MAC=10.13 # MacOS 10.13 (High Sierra) +KEYMAN_MIN_TARGET_VERSION_UBUNTU=20.04 # Ubuntu 20.04 Focal +KEYMAN_MIN_TARGET_VERSION_CHROME=95.0 # Final version that runs on Android 5.0 # Dependency versions KEYMAN_MIN_VERSION_NODE_MAJOR=18 -KEYMAN_MIN_VERSION_NPM=10.5.1 # 10.5.0 has bug, discussed in #10350 -KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.44 # Warning: 3.1.45 is bad (#9529); newer versions work -KEYMAN_MAX_VERSION_EMSCRIPTEN=3.1.58 # See #9529 +KEYMAN_MIN_VERSION_NPM=10.5.1 # 10.5.0 has bug, discussed in #10350 +KEYMAN_MIN_VERSION_EMSCRIPTEN=3.1.44 # Warning: 3.1.45 is bad (#9529); newer versions work +KEYMAN_MAX_VERSION_EMSCRIPTEN=3.1.58 # See #9529 KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019 KEYMAN_MIN_VERSION_MESON=1.0.0 # Language and runtime versions -KEYMAN_MIN_VERSION_JAVA=11 # We're using Java/OpenJDK 11 -KEYMAN_MIN_VERSION_CPP=17 # C++17 +KEYMAN_MIN_VERSION_JAVA=11 # We're using Java/OpenJDK 11 +KEYMAN_MIN_VERSION_CPP=17 # C++17 KEYMAN_MIN_VERSION_ANDROID_SDK=21 # Default version used in Docker containers -KEYMAN_DEFAULT_VERSION_CONTAINER=noble # Ubuntu 24.04 Noble +KEYMAN_DEFAULT_VERSION_UBUNTU_CONTAINER=noble # Ubuntu 24.04 Noble From 4142187f216865f39cb5ac0e6299d0cbc89e7b76 Mon Sep 17 00:00:00 2001 From: Eberhard Beilharz Date: Wed, 8 May 2024 10:56:20 +0200 Subject: [PATCH 5/5] chore(common): Rename variable --- resources/build/minimum-versions.inc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/build/minimum-versions.inc.sh b/resources/build/minimum-versions.inc.sh index 434ff11eead..17757d55848 100644 --- a/resources/build/minimum-versions.inc.sh +++ b/resources/build/minimum-versions.inc.sh @@ -21,7 +21,7 @@ KEYMAN_MIN_VERSION_VISUAL_STUDIO=2019 KEYMAN_MIN_VERSION_MESON=1.0.0 # Language and runtime versions -KEYMAN_MIN_VERSION_JAVA=11 # We're using Java/OpenJDK 11 +KEYMAN_VERSION_JAVA=11 # We're using Java/OpenJDK 11 KEYMAN_MIN_VERSION_CPP=17 # C++17 KEYMAN_MIN_VERSION_ANDROID_SDK=21