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

Cleanup work #691

Merged
merged 7 commits into from
Dec 29, 2021
+103 −96
Merged

Cleanup work #691

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9911fb7
Target newer ecmascript
Danielku15 Dec 29, 2021
b515aaf
Library upgrades
Danielku15 Dec 29, 2021
cdb2dbb
Enable manual builds
Danielku15 Dec 29, 2021
748164a
Update skija
Danielku15 Dec 29, 2021
7b05b56
Adapt emitters to new TS
Danielku15 Dec 29, 2021
f5f1aeb
Further fixes
Danielku15 Dec 29, 2021
245a39a
Install multiple dotnet versions
Danielku15 Dec 29, 2021
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
5 changes: 4 additions & 1 deletion .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ on:
- develop
- master
pull_request:
workflow_dispatch:

jobs:
build_web:
@@ -29,7 +30,9 @@ jobs:
node-version: '12.x'
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
dotnet-version: |
5.0.x
6.0.x
- run: npm install
- run: npm run build-csharp-ci
- run: npm run test-csharp-ci
4 changes: 3 additions & 1 deletion .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,9 @@ jobs:
node-version: '12.x'
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
dotnet-version: |
5.0.x
6.0.x
env:
NUGET_AUTH_TOKEN: ${{secrets.NUGET_API_KEY}}
- run: npm install
4 changes: 3 additions & 1 deletion .github/workflows/release.yml
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,9 @@ jobs:
node-version: '12.x'
- uses: actions/setup-dotnet@v1
with:
dotnet-version: '5.0.x'
dotnet-version: |
5.0.x
6.0.x
env:
NUGET_AUTH_TOKEN: ${{secrets.NUGET_API_KEY}}
- run: npm install
138 changes: 69 additions & 69 deletions package-lock.json
View file

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

16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -57,32 +57,32 @@
"@types/css-font-loading-module": "0.0.7",
"@types/jasmine": "^3.10.2",
"@types/resize-observer-browser": "^0.1.6",
"concurrently": "^6.3.0",
"concurrently": "^6.5.1",
"cors": "^2.8.5",
"fs-extra": "^10.0.0",
"karma": "^6.3.7",
"karma": "^6.3.9",
"karma-chrome-launcher": "^3.1.0",
"karma-express-http-server": "0.0.1",
"karma-jasmine": "^4.0.1",
"karma-jasmine-html-reporter": "^1.7.0",
"karma-rollup-preprocessor": "^7.0.7",
"karma-spec-reporter": "0.0.32",
"lodash": "^4.17.21",
"multer": "^1.4.3",
"multer": "^1.4.4",
"rimraf": "^3.0.2",
"rollup": "^2.59.0",
"rollup": "^2.62.0",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-dts": "^4.0.1",
"rollup-plugin-dts": "^4.1.0",
"rollup-plugin-license": "^2.6.0",
"rollup-plugin-serve": "^1.1.0",
"rollup-plugin-terser": "^7.0.2",
"terser": "^5.9.0",
"terser": "^5.10.0",
"ts-node": "^10.4.0",
"tslint": "^6.1.3",
"tslint-config-prettier": "^1.18.0",
"tslint-config-standard": "^9.0.0",
"ttypescript": "^1.5.12",
"typescript": "^4.4.4"
"ttypescript": "^1.5.13",
"typescript": "^4.5.4"
},
"files": [
"/dist/alphaTab.js",
4 changes: 2 additions & 2 deletions src.compiler/typescript/CloneEmitter.ts
View file
Original file line number Diff line number Diff line change
@@ -325,7 +325,7 @@ export default createEmitter('cloneable', (program, input) => {
false,
undefined,
ts.factory.createNamedImports([
ts.factory.createImportSpecifier(undefined, ts.factory.createIdentifier(name))
ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(name))
])
),
ts.factory.createStringLiteral(module)
@@ -353,7 +353,7 @@ export default createEmitter('cloneable', (program, input) => {
false,
undefined,
ts.factory.createNamedImports([
ts.factory.createImportSpecifier(undefined, ts.factory.createIdentifier(input.name!.text))
ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(input.name!.text))
])
),
ts.factory.createStringLiteral(toImportPath(sourceFileName))
4 changes: 2 additions & 2 deletions src.compiler/typescript/SerializerEmitter.ts
View file
Original file line number Diff line number Diff line change
@@ -1270,7 +1270,7 @@ export default createEmitter('json', (program, input) => {
false,
undefined,
ts.factory.createNamedImports([
ts.factory.createImportSpecifier(undefined, ts.factory.createIdentifier(name))
ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(name))
])
),
ts.factory.createStringLiteral(module)
@@ -1302,7 +1302,7 @@ export default createEmitter('json', (program, input) => {
false,
undefined,
ts.factory.createNamedImports([
ts.factory.createImportSpecifier(undefined, ts.factory.createIdentifier(input.name!.text))
ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier(input.name!.text))
])
),
ts.factory.createStringLiteral(toImportPath(sourceFileName))
6 changes: 3 additions & 3 deletions src.csharp/AlphaTab.Test/AlphaTab.Test.csproj
View file
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.3" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
</ItemGroup>

<ItemGroup>
2 changes: 1 addition & 1 deletion src.csharp/AlphaTab.Windows/AlphaTab.Windows.csproj
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<PackageId>AlphaTab.Windows</PackageId>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFrameworks>netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net5.0-windows;net6.0-windows</TargetFrameworks>
<UseWPF>true</UseWPF>
<UseWindowsForms>true</UseWindowsForms>
<NoWarn>$(NoWarn);NU5105</NoWarn>
6 changes: 3 additions & 3 deletions src.csharp/AlphaTab/AlphaTab.csproj
View file
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="SkiaSharp" Version="2.80.2" />
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2" />
<PackageReference Include="System.Drawing.Common" Version="5.0.2" />
<PackageReference Include="SkiaSharp" Version="2.80.3" />
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.3" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src.csharp/Samples/AlphaTab.Samples.Wpf/AlphaTab.Samples.Wpf.csproj
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
</ItemGroup>

<ItemGroup>
2 changes: 1 addition & 1 deletion src.kotlin/alphaTab/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ kotlin {
}
val jvmMain by getting {
dependencies {
api("org.jetbrains.skija:skija-$target:0.91.3")
api("org.jetbrains.skija:skija-$target:0.93.6")
}
}
jvmMain.kotlin.srcDirs("src/jvmCommon/kotlin")
4 changes: 2 additions & 2 deletions src.kotlin/alphaTab/src/jvmMain/kotlin/alphaTab/platform/jvm/SkiaCanvas.kt
View file
Original file line number Diff line number Diff line change
@@ -131,7 +131,7 @@ public class SkiaCanvas : ICanvas {

override fun fillRect(x: Double, y: Double, w: Double, h: Double) {
createPaint().use {
it.blendMode = BlendMode.SRC_OVER
it.setBlendMode(BlendMode.SRC_OVER)
it.mode = PaintMode.FILL
_surface.canvas.drawRect(
Rect(
@@ -154,7 +154,7 @@ public class SkiaCanvas : ICanvas {

override fun strokeRect(x: Double, y: Double, w: Double, h: Double) {
createPaint().use {
it.blendMode = BlendMode.SRC_OVER
it.setBlendMode(BlendMode.SRC_OVER)
it.mode = PaintMode.STROKE
_surface.canvas.drawRect(
Rect(
2 changes: 1 addition & 1 deletion tsconfig.base.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"moduleResolution": "node",
"target": "es6",
"target": "es2019",
"module": "es6",
"lib": [
"es2015",