From cc37b8245b1c813369ba5ba25775d4b15cc4c128 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Sun, 15 Sep 2024 22:46:20 +0900 Subject: [PATCH 1/3] Merge SDL3-CS.Android into main project --- SDL3-CS.Android.slnf | 1 - SDL3-CS.Android/SDL3-CS.Android.csproj | 25 ------------------ .../SDL3-CS.Tests.Android.csproj | 1 - SDL3-CS.sln | 6 ----- .../Additions/AboutAdditions.txt | 0 .../Jars/SDL3AndroidBridge.jar | Bin SDL3-CS/SDL3-CS.csproj | 4 ++- .../Transforms/EnumFields.xml | 0 .../Transforms/EnumMethods.xml | 0 .../Transforms/Metadata.xml | 0 10 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 SDL3-CS.Android/SDL3-CS.Android.csproj rename {SDL3-CS.Android => SDL3-CS}/Additions/AboutAdditions.txt (100%) rename {SDL3-CS.Android => SDL3-CS}/Jars/SDL3AndroidBridge.jar (100%) rename {SDL3-CS.Android => SDL3-CS}/Transforms/EnumFields.xml (100%) rename {SDL3-CS.Android => SDL3-CS}/Transforms/EnumMethods.xml (100%) rename {SDL3-CS.Android => SDL3-CS}/Transforms/Metadata.xml (100%) diff --git a/SDL3-CS.Android.slnf b/SDL3-CS.Android.slnf index 061ae2f..f8eda9c 100644 --- a/SDL3-CS.Android.slnf +++ b/SDL3-CS.Android.slnf @@ -4,7 +4,6 @@ "projects": [ "SDL3-CS\\SDL3-CS.csproj", "SDL3-CS.SourceGeneration\\SDL3-CS.SourceGeneration.csproj", - "SDL3-CS.Android\\SDL3-CS.Android.csproj", "SDL3-CS.Tests\\SDL3-CS.Tests.csproj", "SDL3-CS.Tests.Android\\SDL3-CS.Tests.Android.csproj" ] diff --git a/SDL3-CS.Android/SDL3-CS.Android.csproj b/SDL3-CS.Android/SDL3-CS.Android.csproj deleted file mode 100644 index ec12aaa..0000000 --- a/SDL3-CS.Android/SDL3-CS.Android.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - net8.0-android - 21 - SDL.Android - enable - enable - - - - ppy Pty Ltd - ppy Pty Ltd - Copyright (c) 2024 ppy Pty Ltd - ppy.SDL3-CS.Android - ppy.SDL3-CS.Android - Automated release. - MIT - https://github.com/ppy/SDL3-CS - https://github.com/ppy/SDL3-CS - - - - - - diff --git a/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj b/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj index e84e625..e639325 100644 --- a/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj +++ b/SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj @@ -13,7 +13,6 @@ - diff --git a/SDL3-CS.sln b/SDL3-CS.sln index a7f2209..2933781 100644 --- a/SDL3-CS.sln +++ b/SDL3-CS.sln @@ -19,8 +19,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.SourceGeneration", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SDL3-CS.Tests", "SDL3-CS.Tests\SDL3-CS.Tests.csproj", "{CF980481-8227-4BED-970E-6433C83F64CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Android", "SDL3-CS.Android\SDL3-CS.Android.csproj", "{CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Tests.Android", "SDL3-CS.Tests.Android\SDL3-CS.Tests.Android.csproj", "{E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SDL3-CS.Tests.iOS", "SDL3-CS.Tests.iOS\SDL3-CS.Tests.iOS.csproj", "{CCDD11EE-D552-4925-8B68-351AC9317589}" @@ -45,10 +43,6 @@ Global {CF980481-8227-4BED-970E-6433C83F64CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {CF980481-8227-4BED-970E-6433C83F64CB}.Release|Any CPU.ActiveCfg = Release|Any CPU {CF980481-8227-4BED-970E-6433C83F64CB}.Release|Any CPU.Build.0 = Release|Any CPU - {CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA28F49C-D0BE-47D6-9E82-7A0B8C380B8B}.Release|Any CPU.Build.0 = Release|Any CPU {E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8469DA5-E437-4287-9E2A-8B8F4DC21C1A}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/SDL3-CS.Android/Additions/AboutAdditions.txt b/SDL3-CS/Additions/AboutAdditions.txt similarity index 100% rename from SDL3-CS.Android/Additions/AboutAdditions.txt rename to SDL3-CS/Additions/AboutAdditions.txt diff --git a/SDL3-CS.Android/Jars/SDL3AndroidBridge.jar b/SDL3-CS/Jars/SDL3AndroidBridge.jar similarity index 100% rename from SDL3-CS.Android/Jars/SDL3AndroidBridge.jar rename to SDL3-CS/Jars/SDL3AndroidBridge.jar diff --git a/SDL3-CS/SDL3-CS.csproj b/SDL3-CS/SDL3-CS.csproj index dd15bdd..b3ef941 100644 --- a/SDL3-CS/SDL3-CS.csproj +++ b/SDL3-CS/SDL3-CS.csproj @@ -1,8 +1,9 @@  - net8.0 SDL + net8.0;net8.0-android + 21 enable true $(NoWarn);SYSLIB1054;CA1401 @@ -93,6 +94,7 @@ runtimes/android-x86/native true + diff --git a/SDL3-CS.Android/Transforms/EnumFields.xml b/SDL3-CS/Transforms/EnumFields.xml similarity index 100% rename from SDL3-CS.Android/Transforms/EnumFields.xml rename to SDL3-CS/Transforms/EnumFields.xml diff --git a/SDL3-CS.Android/Transforms/EnumMethods.xml b/SDL3-CS/Transforms/EnumMethods.xml similarity index 100% rename from SDL3-CS.Android/Transforms/EnumMethods.xml rename to SDL3-CS/Transforms/EnumMethods.xml diff --git a/SDL3-CS.Android/Transforms/Metadata.xml b/SDL3-CS/Transforms/Metadata.xml similarity index 100% rename from SDL3-CS.Android/Transforms/Metadata.xml rename to SDL3-CS/Transforms/Metadata.xml From be06fff363b38c3aaa3df626702597919cff46ea Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Tue, 3 Dec 2024 20:57:04 +0900 Subject: [PATCH 2/3] Update GHA workflows --- .github/workflows/build.yml | 6 ++--- .github/workflows/deploy.yml | 48 ++++++++++-------------------------- 2 files changed, 16 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc91c61..8050585 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -157,7 +157,7 @@ jobs: run: | export JAVA_HOME=$JAVA_HOME_11_X64 export PATH=$JAVA_HOME_11_X64/bin:$PATH - export OUTPUT=$PWD/SDL3-CS.Android/Jars/ + export OUTPUT=$PWD/SDL3-CS/Jars/ rm -rf $OUTPUT && mkdir -p $OUTPUT # Build SDL3 Android Java part @@ -179,7 +179,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: android-jar - path: SDL3-CS.Android/Jars/SDL3AndroidBridge.jar + path: SDL3-CS/Jars/SDL3AndroidBridge.jar if-no-files-found: error make-pr: @@ -207,7 +207,7 @@ jobs: uses: actions/download-artifact@v4 with: name: android-jar - path: SDL3-CS.Android/Jars/ + path: SDL3-CS/Jars/ - name: Create pull request uses: peter-evans/create-pull-request@v6 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f875e85..3f6b211 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,7 +6,7 @@ on: - '*' jobs: - desktop: + pack: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -16,10 +16,19 @@ jobs: with: dotnet-version: 8.0.x - - name: Build - run: dotnet build SDL3-CS.Desktop.slnf -c Release + - name: Setup JDK 17 + uses: actions/setup-java@v4 + with: + distribution: microsoft + java-version: 17 - - name: Pack + - name: Setup Android SDK + uses: android-actions/setup-android@v3 + + - name: Install .NET workloads + run: dotnet workload restore SDL3-CS/SDL3-CS.csproj + + - name: Build & pack run: dotnet pack SDL3-CS/SDL3-CS.csproj -c Release /p:Version=$(git describe --exact-match --tags HEAD) - name: Upload artifact @@ -30,34 +39,3 @@ jobs: - name: Publish tagged release to nuget.org run: dotnet nuget push SDL3-CS/bin/Release/ppy.*.nupkg -s https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_API_KEY}} - - android: - runs-on: windows-latest - steps: - - uses: actions/checkout@v4 - - - name: Setup .NET - uses: actions/setup-dotnet@v4 - with: - dotnet-version: 8.0.x - - - name: Install Android workload - # since windows image 20241113.3.0, not specifying a version here - # installs the .NET 7 version of android workload for very unknown reasons. - # revisit once we upgrade to .NET 9, it's probably fixed there. - run: dotnet workload install android --version (dotnet --version) - - - name: Build - run: dotnet build SDL3-CS.Android.slnf -c Release - - - name: Pack - run: dotnet pack SDL3-CS.Android\SDL3-CS.Android.csproj -c Release /p:Version=$(git describe --exact-match --tags HEAD) - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: SDL3-CS.Android - path: SDL3-CS.Android\bin\Release\ppy.*.nupkg - - - name: Publish tagged release to nuget.org - run: dotnet nuget push SDL3-CS.Android\bin\Release\ppy.*.nupkg -s https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_API_KEY}} From 2cc61ee83766f1f3f1f038218397e66af13fe195 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Wed, 4 Dec 2024 14:46:45 +0900 Subject: [PATCH 3/3] Remove IDEA workspaces --- .idea/.idea.SDL3-CS.Android/.idea/.name | 1 - .idea/.idea.SDL3-CS.Android/.idea/indexLayout.xml | 8 -------- .../.idea/projectSettingsUpdater.xml | 6 ------ 3 files changed, 15 deletions(-) delete mode 100644 .idea/.idea.SDL3-CS.Android/.idea/.name delete mode 100644 .idea/.idea.SDL3-CS.Android/.idea/indexLayout.xml delete mode 100644 .idea/.idea.SDL3-CS.Android/.idea/projectSettingsUpdater.xml diff --git a/.idea/.idea.SDL3-CS.Android/.idea/.name b/.idea/.idea.SDL3-CS.Android/.idea/.name deleted file mode 100644 index 104344e..0000000 --- a/.idea/.idea.SDL3-CS.Android/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -SDL3-CS.Android \ No newline at end of file diff --git a/.idea/.idea.SDL3-CS.Android/.idea/indexLayout.xml b/.idea/.idea.SDL3-CS.Android/.idea/indexLayout.xml deleted file mode 100644 index 7b08163..0000000 --- a/.idea/.idea.SDL3-CS.Android/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/.idea.SDL3-CS.Android/.idea/projectSettingsUpdater.xml b/.idea/.idea.SDL3-CS.Android/.idea/projectSettingsUpdater.xml deleted file mode 100644 index 4bb9f4d..0000000 --- a/.idea/.idea.SDL3-CS.Android/.idea/projectSettingsUpdater.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file