diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5bf5c02..176ea68f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive # Requires manually keeping up to date with package.json - TF_TFW_VERSION: 1.4.0 + TF_TFW_VERSION: 2.0.0 stages: - build @@ -32,10 +32,12 @@ build::bundle: - python ./Scripts/UpdateVersionFile.py --path ${CI_PROJECT_DIR}/Version.txt --swVer $TF_TFW_VERSION --apiVer $TF_API_VERSION --ref ${CI_COMMIT_SHORT_SHA} --branchName "$CI_COMMIT_REF_NAME" - Get-Content ${CI_PROJECT_DIR}/Version.txt + # Build Tooling - cd ${CI_PROJECT_DIR} - npm i - npm run build:bundle + - npx generate-license-file --input ./package.json --output $CI_PROJECT_DIR/ThirdPartyLicenses.txt # Clean last build - cd ${CI_PROJECT_DIR} - if (Test-Path -Path "./Tooling_Release") { @@ -44,6 +46,7 @@ build::bundle: } # Package Tooling - mkdir ./Tooling_Release + - cp $CI_PROJECT_DIR/ThirdPartyLicenses.txt ./Tooling_Release - cp ${CI_PROJECT_DIR}/Version.txt ./Tooling_Release - cp ${CI_PROJECT_DIR}/CHANGELOG.md ./Tooling_Release - cp -R ${CI_PROJECT_DIR}/dist ./Tooling_Release @@ -137,7 +140,7 @@ npm::publish: - docker-windows image: registry.ultrahaptics.com/ooh/infrastructure/windows-touchfree-toolchain:latest only: - - release + - /^release\/.+/ script: - npm config -L project set //registry.npmjs.org/:username=ul-touchfree - npm config -L project set //registry.npmjs.org/:_authToken=$NPM_TOKEN @@ -152,7 +155,7 @@ npm::pack: - docker-windows image: registry.ultrahaptics.com/ooh/infrastructure/windows-touchfree-toolchain:latest only: - - release + - /^release\/.+/ script: - npm i - npm run build:tsc diff --git a/CHANGELOG.md b/CHANGELOG.md index 9916e708..3c18bf48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ All notable changes to the TouchFree Web Tooling project are documented in this The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [2.0.0] - 2023-11-07 ### Added diff --git a/Plugins/SnappingPlugin/Snapping_Example.js b/Plugins/SnappingPlugin/Snapping_Example.js index f53e1f1e..00316083 100644 --- a/Plugins/SnappingPlugin/Snapping_Example.js +++ b/Plugins/SnappingPlugin/Snapping_Example.js @@ -2,9 +2,9 @@ window.onload = function () { touchfree.init(); var plugins = [new SnappingPlugin.SnappingPlugin()]; - touchfree.InputActionManager.setPlugins(plugins); + touchfree.internal.InputActionManager.setPlugins(plugins); - touchfree.InputActionManager.plugins[0].setSnapModeToMagnet(); - touchfree.InputActionManager.plugins[0].setSnapDistance(25); - touchfree.InputActionManager.plugins[0].setSnapSoftness(0.3); + touchfree.internal.InputActionManager.plugins[0].setSnapModeToMagnet(); + touchfree.internal.InputActionManager.plugins[0].setSnapDistance(25); + touchfree.internal.InputActionManager.plugins[0].setSnapSoftness(0.3); }; diff --git a/package-lock.json b/package-lock.json index 9ee635d3..a70b1d65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "touchfree", - "version": "1.4.0", + "version": "2.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "touchfree", - "version": "1.4.0", + "version": "2.0.0", "license": "Apache-2.0", "dependencies": { "uuid": "^9.0.0" diff --git a/package.json b/package.json index a4470b2d..4b505109 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "touchfree", - "version": "1.4.0", + "version": "2.0.0", "description": "The web tooling library for Ultraleap's TouchFree solution.", "keywords": [ "touchfree",