fix: Use KeymanVersion from shared-sites

keymanapp · Feb 11, 2025 · a2c22da · a2c22da
1 parent b1ca191
commit a2c22da
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 25 deletions.
diff --git a/_includes/2020/KeymanVersion.php b/_includes/2020/KeymanVersion.php
diff --git a/_includes/2020/templates/Foot.php b/_includes/2020/templates/Foot.php
@@ -4,7 +4,7 @@
   namespace Keyman\Site\com\keyman\templates;
 
   use Keyman\Site\Common\ImageRandomizer;
-  use Keyman\Site\com\keyman\KeymanVersion;
+  use Keyman\Site\Common\KeymanVersion;
   use Keyman\Site\Common\KeymanHosts;
 
   class Foot {

diff --git a/_includes/2020/templates/Menu.php b/_includes/2020/templates/Menu.php
@@ -4,7 +4,7 @@
   namespace Keyman\Site\com\keyman\templates;
 
   use Keyman\Site\com\keyman\Util;
-  use Keyman\Site\com\keyman\KeymanVersion;
+  use Keyman\Site\Common\KeymanVersion;
   use Keyman\Site\Common\KeymanHosts;
 
   class Menu {

diff --git a/_includes/includes/servervars.php b/_includes/includes/servervars.php
@@ -22,11 +22,11 @@
   Keyman\Site\com\keyman\KeymanComSentry::init();
 
   // *don't* use autoloader here because it may lead to side-effects in older pages
-  require_once(__DIR__ . '/../2020/KeymanVersion.php');
+  require_once(__DIR__ . '/../../_common/KeymanVersion.php');
   require_once(__DIR__ . '/../../_common/KeymanHosts.php');
   require_once(__DIR__ . '/../2020/Util.php');
 
-  use \Keyman\Site\com\keyman\KeymanVersion;
+  use \Keyman\Site\Common\KeymanVersion;
   use \Keyman\Site\Common\KeymanHosts;
   use \Keyman\Site\com\keyman\Util;
 

diff --git a/_includes/includes/template.php b/_includes/includes/template.php
@@ -3,7 +3,7 @@
 
   // *Don't* use autoloader here because of potential side-effects in older pages
   require_once(__DIR__ . '/../2020/Util.php');
-  require_once(__DIR__ . '/../2020/KeymanVersion.php');
+  require_once(__DIR__ . '/../../_common/KeymanVersion.php');
   require_once(__DIR__ . '/../2020/templates/Head.php');
 
   function template_finish($foot) {

diff --git a/bookmarklet/index.php b/bookmarklet/index.php
@@ -2,7 +2,7 @@
   require_once('includes/template.php');
   require_once __DIR__ . '/../_includes/autoload.php';
   use Keyman\Site\Common\KeymanHosts;
-  use Keyman\Site\com\keyman\KeymanVersion;
+  use Keyman\Site\Common\KeymanVersion;
 
   $lang = isset($_GET['language']) ? json_encode($_GET['language']) : '""';
   $kbd = isset($_GET['keyboard']) ? json_encode($_GET['keyboard']) : '""';

diff --git a/build.sh b/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD SITE BUILD SCRIPT INCLUDE
 readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh"
-readonly BOOTSTRAP_VERSION=v0.15
+readonly BOOTSTRAP_VERSION=fix/keyman-version # TODO: v0.16
 [ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
 ## END STANDARD SITE BUILD SCRIPT INCLUDE