Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ jobs:
with:
name: nupkgs
path: dist/.organize/nupkgs
- run: ./build.sh DotNetPublish
- run: dotnet build/bin/Debug/publish/_build.dll DotNetPublish
shell: bash

java-publish:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -70,7 +71,8 @@ jobs:
# name: maven
# path: dist/.organize/maven
path: dist/.organize
- run: ./build.sh JavaPublish
- run: dotnet build/bin/Debug/publish/_build.dll JavaPublish
shell: bash

node-publish:
runs-on: ubuntu-latest
Expand All @@ -94,4 +96,5 @@ jobs:
with:
node-version: "lts/*"
registry-url: https://registry.npmjs.org/
- run: ./build.sh NodePublish
- run: dotnet build/bin/Debug/publish/_build.dll NodePublish
shell: bash
10 changes: 8 additions & 2 deletions .github/workflows/~dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ jobs:
- uses: actions/download-artifact@v4
with:
path: dist/.organize
- run: ./build.cmd DotNet
- run: dotnet build/bin/Debug/publish/_build.dll DotNet
shell: bash
- uses: actions/upload-artifact@v4
with:
name: nupkgs
Expand Down Expand Up @@ -54,11 +55,16 @@ 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 }}
shell: bash
- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/~java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ jobs:
- uses: actions/download-artifact@v4
with:
path: dist/.organize
- run: ./build.cmd Java
- run: dotnet build/bin/Debug/publish/_build.dll Java
shell: bash
- uses: actions/upload-artifact@v4
with:
name: maven
Expand Down Expand Up @@ -67,7 +68,8 @@ jobs:
with:
name: maven
path: dist/.organize/maven
- run: ./build.cmd JavaTest
- run: dotnet build/bin/Debug/publish/_build.dll JavaTest
shell: bash
- uses: actions/upload-artifact@v4
if: always()
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/~native.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/~node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ jobs:
- uses: actions/download-artifact@v4
with:
path: dist/.organize
- run: ./build.cmd Node
- run: dotnet build/bin/Debug/publish/_build.dll Node
shell: bash
- uses: actions/upload-artifact@v4
with:
name: nodetars
Expand All @@ -44,14 +45,19 @@ 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
path: dist/.organize/node
- uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
- run: ./build.cmd NodeTest
- 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"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/~reusable-full-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/Build.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion lib/dotnet/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<DebugType>portable</DebugType>
<DebugSymbols>true</DebugSymbols>
<Version Condition=" '$(Version)' == '' ">3.1.135</Version>
<Version Condition=" '$(Version)' == '' ">3.2.135</Version>
<AssemblyVersion Condition=" '$(AssemblyVersion)' == '' ">$(Version).0</AssemblyVersion>
<FileVersion Condition=" '$(FileVersion)' == '' ">$(AssemblyVersion)</FileVersion>
<NeutralLanguage>en</NeutralLanguage>
Expand Down
2 changes: 1 addition & 1 deletion lib/java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down
2 changes: 1 addition & 1 deletion lib/java/jni/src/AlphaSkiaTextMetrics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ extern "C"
CHECK_HANDLE_RETURN(handle, static_cast<jfloat>(0))

uint16_t value = alphaskia_text_metrics_get_width(reinterpret_cast<alphaskia_text_metrics_t>(handle));
return static_cast<jint>(value);
return static_cast<jfloat>(value);
}

JNIEXPORT jfloat JNICALL Java_alphaTab_alphaSkia_AlphaSkiaTextMetrics_getActualBoundingBoxLeft(JNIEnv *env, jobject instance)
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia-linux/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia-macos/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia-windows/package.json
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion lib/node/alphaskia/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion test/java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alphaskiatest",
"version": "3.1.135",
"version": "3.2.135",
"private": true,
"scripts": {
"start": "tsx index.ts"
Expand Down
Loading