Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release 2.0.0 #44

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Release 2.0.0 #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de75c75
Update version to 2.0.0
Nov 7, 2023
8a6f2a7
Update changelog
Nov 7, 2023
9e980c9
Update snapping example for 2.0.0
Nov 7, 2023
0014bc6
Remove console log
Nov 7, 2023
ab087f8
Add third party licenses
Nov 7, 2023
21b3811
Fix CI
Nov 7, 2023
bc7b64b
Fix CI 2
Nov 7, 2023
020530d
Update npm script CI restrictions
Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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") {
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Plugins/SnappingPlugin/Snapping_Example.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down