From 4a0402201e1bbc0143c0d29335180e56f43f03b8 Mon Sep 17 00:00:00 2001 From: Danielku15 Date: Fri, 2 May 2025 18:00:51 +0200 Subject: [PATCH 1/3] fix(java): No rounding of width --- lib/java/jni/src/AlphaSkiaTextMetrics.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/java/jni/src/AlphaSkiaTextMetrics.cpp b/lib/java/jni/src/AlphaSkiaTextMetrics.cpp index ad83c4e..653bbef 100644 --- a/lib/java/jni/src/AlphaSkiaTextMetrics.cpp +++ b/lib/java/jni/src/AlphaSkiaTextMetrics.cpp @@ -10,7 +10,7 @@ extern "C" CHECK_HANDLE_RETURN(handle, static_cast(0)) uint16_t value = alphaskia_text_metrics_get_width(reinterpret_cast(handle)); - return static_cast(value); + return static_cast(value); } JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getActualBoundingBoxLeft(JNIEnv *env, jobject instance) From 54bde7bee49ed3606046ad9cefd47443236bcc70 Mon Sep 17 00:00:00 2001 From: Danielku15 Date: Fri, 2 May 2025 18:01:44 +0200 Subject: [PATCH 2/3] build: Bump version and use cached nuke --- .github/workflows/publish.yml | 6 +++--- .github/workflows/~dotnet.yml | 8 ++++++-- .github/workflows/~java.yml | 4 ++-- .github/workflows/~node.yml | 8 ++++++-- build/Build.cs | 2 +- lib/dotnet/Directory.Build.props | 2 +- lib/java/build.gradle.kts | 2 +- lib/node/alphaskia-linux/package.json | 2 +- lib/node/alphaskia-macos/package.json | 2 +- lib/node/alphaskia-windows/package.json | 2 +- lib/node/alphaskia/package.json | 2 +- test/java/build.gradle.kts | 2 +- test/node/package.json | 2 +- 13 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7bafb20..3184b1c 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -38,7 +38,7 @@ jobs: with: name: nupkgs path: dist/.organize/nupkgs - - run: ./build.sh DotNetPublish + - run: dotnet build/bin/Debug/publish/_build.dll DotNetPublish java-publish: runs-on: ubuntu-latest @@ -70,7 +70,7 @@ jobs: # name: maven # path: dist/.organize/maven path: dist/.organize - - run: ./build.sh JavaPublish + - run: dotnet build/bin/Debug/publish/_build.dll JavaPublish node-publish: runs-on: ubuntu-latest @@ -94,4 +94,4 @@ jobs: with: node-version: "lts/*" registry-url: https://registry.npmjs.org/ - - run: ./build.sh NodePublish \ No newline at end of file + - run: dotnet build/bin/Debug/publish/_build.dll NodePublish \ No newline at end of file diff --git a/.github/workflows/~dotnet.yml b/.github/workflows/~dotnet.yml index 75bb294..0951f21 100644 --- a/.github/workflows/~dotnet.yml +++ b/.github/workflows/~dotnet.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/download-artifact@v4 with: path: dist/.organize - - run: ./build.cmd DotNet + - run: dotnet build/bin/Debug/publish/_build.dll DotNet - uses: actions/upload-artifact@v4 with: name: nupkgs @@ -54,11 +54,15 @@ jobs: with: dotnet-version: '9' - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: nuke + path: build/bin/Debug/publish/ - uses: actions/download-artifact@v4 with: name: nupkgs path: dist/.organize/nupkgs - - run: ./build.cmd DotNetTest --architecture ${{ matrix.architecture }} --framework ${{ matrix.framework }} + - run: dotnet build/bin/Debug/publish/_build.dll DotNetTest --architecture ${{ matrix.architecture }} --framework ${{ matrix.framework }} - uses: actions/upload-artifact@v4 if: always() with: diff --git a/.github/workflows/~java.yml b/.github/workflows/~java.yml index 0deb815..bc733a9 100644 --- a/.github/workflows/~java.yml +++ b/.github/workflows/~java.yml @@ -34,7 +34,7 @@ jobs: - uses: actions/download-artifact@v4 with: path: dist/.organize - - run: ./build.cmd Java + - run: dotnet build/bin/Debug/publish/_build.dll Java - uses: actions/upload-artifact@v4 with: name: maven @@ -67,7 +67,7 @@ jobs: with: name: maven path: dist/.organize/maven - - run: ./build.cmd JavaTest + - run: dotnet build/bin/Debug/publish/_build.dll JavaTest - uses: actions/upload-artifact@v4 if: always() with: diff --git a/.github/workflows/~node.yml b/.github/workflows/~node.yml index 8397c9d..4d73c9b 100644 --- a/.github/workflows/~node.yml +++ b/.github/workflows/~node.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/download-artifact@v4 with: path: dist/.organize - - run: ./build.cmd Node + - run: dotnet build/bin/Debug/publish/_build.dll Node - uses: actions/upload-artifact@v4 with: name: nodetars @@ -44,6 +44,10 @@ jobs: with: dotnet-version: '9' - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 + with: + name: nuke + path: build/bin/Debug/publish/ - uses: actions/download-artifact@v4 with: name: nodetars @@ -51,7 +55,7 @@ jobs: - uses: actions/setup-node@v4 with: node-version: ${{ matrix.node }} - - run: ./build.cmd NodeTest + - run: dotnet build/bin/Debug/publish/_build.dll NodeTest - id: sanitize-node-version if: always() run: echo "NODE_VERSION=${{ matrix.node }}" | sed 's/[*\/]//g' >> "$GITHUB_OUTPUT" diff --git a/build/Build.cs b/build/Build.cs index a5cc895..7f30d2e 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -37,7 +37,7 @@ static int LoadSkiaVersion() return int.Parse(text[(startOfMarker + marker.Length)..endOfMarker].Trim()); } - static readonly Version FileVersionBase = new Version(3, 1, 0, 0); + static readonly Version FileVersionBase = new Version(3, 2, 0, 0); #endregion diff --git a/lib/dotnet/Directory.Build.props b/lib/dotnet/Directory.Build.props index 9302019..cd12230 100644 --- a/lib/dotnet/Directory.Build.props +++ b/lib/dotnet/Directory.Build.props @@ -3,7 +3,7 @@ portable true - 3.1.135 + 3.2.135 $(Version).0 $(AssemblyVersion) en diff --git a/lib/java/build.gradle.kts b/lib/java/build.gradle.kts index 06f6f6b..dae261d 100644 --- a/lib/java/build.gradle.kts +++ b/lib/java/build.gradle.kts @@ -20,7 +20,7 @@ var libAuthorId = "" var libAuthorName = "" var libOrgUrl = "" var libCompany = "" -var libVersion = "3.1.135" +var libVersion = "3.2.135" var libProjectUrl = "" var libGitUrlHttp = "" var libGitUrlGit = "" diff --git a/lib/node/alphaskia-linux/package.json b/lib/node/alphaskia-linux/package.json index 604001b..8b7892e 100644 --- a/lib/node/alphaskia-linux/package.json +++ b/lib/node/alphaskia-linux/package.json @@ -1,6 +1,6 @@ { "name": "@coderline/alphaskia-linux", - "version": "3.1.135", + "version": "3.2.135", "description": "The node addon for alphaSkia enabling it to run on Linux", "engines": { "node": ">=18.0.0" diff --git a/lib/node/alphaskia-macos/package.json b/lib/node/alphaskia-macos/package.json index d4a50d1..c23dd04 100644 --- a/lib/node/alphaskia-macos/package.json +++ b/lib/node/alphaskia-macos/package.json @@ -1,6 +1,6 @@ { "name": "@coderline/alphaskia-macos", - "version": "3.1.135", + "version": "3.2.135", "description": "The node addon for alphaSkia enabling it to run on MacOS", "engines": { "node": ">=18.0.0" diff --git a/lib/node/alphaskia-windows/package.json b/lib/node/alphaskia-windows/package.json index bceb13f..ef0699e 100644 --- a/lib/node/alphaskia-windows/package.json +++ b/lib/node/alphaskia-windows/package.json @@ -1,6 +1,6 @@ { "name": "@coderline/alphaskia-windows", - "version": "3.1.135", + "version": "3.2.135", "description": "The node addon for alphaSkia enabling it to run on Windows", "engines": { "node": ">=18.0.0" diff --git a/lib/node/alphaskia/package.json b/lib/node/alphaskia/package.json index f491ee1..353d025 100644 --- a/lib/node/alphaskia/package.json +++ b/lib/node/alphaskia/package.json @@ -1,6 +1,6 @@ { "name": "@coderline/alphaskia", - "version": "3.1.135", + "version": "3.2.135", "description": "A Skia based rendering backend for alphaTab.", "module": "./dist/alphaskia.mjs", "typings": "./dist/alphaskia.d.ts", diff --git a/test/java/build.gradle.kts b/test/java/build.gradle.kts index 3e6e15e..51c06f9 100644 --- a/test/java/build.gradle.kts +++ b/test/java/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } // do not inline (updated dynamically via Nuke) -var libVersion = "3.1.135" +var libVersion = "3.2.135" group = "alphaTab.alphaSkia" version = libVersion diff --git a/test/node/package.json b/test/node/package.json index 8f085cb..6513cc3 100644 --- a/test/node/package.json +++ b/test/node/package.json @@ -1,6 +1,6 @@ { "name": "alphaskiatest", - "version": "3.1.135", + "version": "3.2.135", "private": true, "scripts": { "start": "tsx index.ts" From 075d8eab5cc9d497788ea579a79b7423d5393f4d Mon Sep 17 00:00:00 2001 From: Danielku15 Date: Fri, 2 May 2025 18:08:29 +0200 Subject: [PATCH 3/3] build: Use bash for all commands --- .github/workflows/publish.yml | 5 ++++- .github/workflows/~dotnet.yml | 2 ++ .github/workflows/~java.yml | 2 ++ .github/workflows/~native.yml | 2 ++ .github/workflows/~node.yml | 2 ++ .github/workflows/~reusable-full-build.yml | 1 + 6 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3184b1c..f7092d4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -39,6 +39,7 @@ jobs: name: nupkgs path: dist/.organize/nupkgs - run: dotnet build/bin/Debug/publish/_build.dll DotNetPublish + shell: bash java-publish: runs-on: ubuntu-latest @@ -71,6 +72,7 @@ jobs: # path: dist/.organize/maven path: dist/.organize - run: dotnet build/bin/Debug/publish/_build.dll JavaPublish + shell: bash node-publish: runs-on: ubuntu-latest @@ -94,4 +96,5 @@ jobs: with: node-version: "lts/*" registry-url: https://registry.npmjs.org/ - - run: dotnet build/bin/Debug/publish/_build.dll NodePublish \ No newline at end of file + - run: dotnet build/bin/Debug/publish/_build.dll NodePublish + shell: bash \ No newline at end of file diff --git a/.github/workflows/~dotnet.yml b/.github/workflows/~dotnet.yml index 0951f21..135fd5b 100644 --- a/.github/workflows/~dotnet.yml +++ b/.github/workflows/~dotnet.yml @@ -25,6 +25,7 @@ jobs: with: path: dist/.organize - run: dotnet build/bin/Debug/publish/_build.dll DotNet + shell: bash - uses: actions/upload-artifact@v4 with: name: nupkgs @@ -63,6 +64,7 @@ jobs: name: nupkgs path: dist/.organize/nupkgs - run: dotnet build/bin/Debug/publish/_build.dll DotNetTest --architecture ${{ matrix.architecture }} --framework ${{ matrix.framework }} + shell: bash - uses: actions/upload-artifact@v4 if: always() with: diff --git a/.github/workflows/~java.yml b/.github/workflows/~java.yml index bc733a9..90f2216 100644 --- a/.github/workflows/~java.yml +++ b/.github/workflows/~java.yml @@ -35,6 +35,7 @@ jobs: with: path: dist/.organize - run: dotnet build/bin/Debug/publish/_build.dll Java + shell: bash - uses: actions/upload-artifact@v4 with: name: maven @@ -68,6 +69,7 @@ jobs: name: maven path: dist/.organize/maven - run: dotnet build/bin/Debug/publish/_build.dll JavaTest + shell: bash - uses: actions/upload-artifact@v4 if: always() with: diff --git a/.github/workflows/~native.yml b/.github/workflows/~native.yml index c11f75f..158bdf0 100644 --- a/.github/workflows/~native.yml +++ b/.github/workflows/~native.yml @@ -65,6 +65,7 @@ jobs: - name: Compiling LibSkia run: dotnet build/bin/Debug/publish/_build.dll LibSkiaWithCache --target-os ${{ inputs.target-os }} --architecture ${{ matrix.architecture }} --use-cache ${{ inputs.use-skia-cache }} + shell: bash id: build - name: Uploading LibSkia to Artifacts @@ -112,6 +113,7 @@ jobs: - name: Compiling LibAlphaSkia run: dotnet build/bin/Debug/publish/_build.dll LibAlphaSkia LibAlphaSkiaTest --target-os ${{ inputs.target-os }} --architecture ${{ matrix.architecture }} --variant ${{ matrix.variant }} + shell: bash - name: Uploading LibAlphaSkia to Artifacts uses: actions/upload-artifact@v4 diff --git a/.github/workflows/~node.yml b/.github/workflows/~node.yml index 4d73c9b..841e13e 100644 --- a/.github/workflows/~node.yml +++ b/.github/workflows/~node.yml @@ -26,6 +26,7 @@ jobs: with: path: dist/.organize - run: dotnet build/bin/Debug/publish/_build.dll Node + shell: bash - uses: actions/upload-artifact@v4 with: name: nodetars @@ -56,6 +57,7 @@ jobs: with: node-version: ${{ matrix.node }} - run: dotnet build/bin/Debug/publish/_build.dll NodeTest + shell: bash - id: sanitize-node-version if: always() run: echo "NODE_VERSION=${{ matrix.node }}" | sed 's/[*\/]//g' >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/~reusable-full-build.yml b/.github/workflows/~reusable-full-build.yml index 0ed6818..87458d9 100644 --- a/.github/workflows/~reusable-full-build.yml +++ b/.github/workflows/~reusable-full-build.yml @@ -25,6 +25,7 @@ jobs: with: dotnet-version: '9' - run: dotnet publish --configuration Debug ./build/_build.csproj + shell: bash - uses: actions/upload-artifact@v4 with: name: nuke