Merge pull request #181 from smoogipoo/merge-android

Merge Android into the main project + NuGet package

.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

.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}}

.idea/.idea.SDL3-CS.Android/.idea/.name

@@ -1 +0,0 @@
-SDL3-CS.Android

.idea/.idea.SDL3-CS.Android/.idea/indexLayout.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="UserContentModel">
-    <attachedFolders />
-    <explicitIncludes />
-    <explicitExcludes />
-  </component>
-</project>

.idea/.idea.SDL3-CS.Android/.idea/projectSettingsUpdater.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RiderProjectSettingsUpdater">
-    <option name="vcsConfiguration" value="2" />
-  </component>
-</project>

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"
     ]

SDL3-CS.Android/SDL3-CS.Android.csproj

@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net8.0-android</TargetFramework>
-    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
-    <RootNamespace>SDL.Android</RootNamespace>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <PropertyGroup Label="NuGet">
-    <Authors>ppy Pty Ltd</Authors>
-    <Company>ppy Pty Ltd</Company>
-    <Copyright>Copyright (c) 2024 ppy Pty Ltd</Copyright>
-    <Product>ppy.SDL3-CS.Android</Product>
-    <PackageId>ppy.SDL3-CS.Android</PackageId>
-    <PackageReleaseNotes>Automated release.</PackageReleaseNotes>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/ppy/SDL3-CS</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/ppy/SDL3-CS</RepositoryUrl>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <EmbeddedJar Include="Jars\SDL3AndroidBridge.jar" />
-  </ItemGroup>
-</Project>

SDL3-CS.Tests.Android/SDL3-CS.Tests.Android.csproj

@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\SDL3-CS.Tests\SDL3-CS.Tests.csproj"/>
-    <ProjectReference Include="..\SDL3-CS.Android\SDL3-CS.Android.csproj"/>
   </ItemGroup>
 
   <ItemGroup>

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

SDL3-CS/SDL3-CS.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>SDL</RootNamespace>
+    <TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
+    <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <NoWarn>$(NoWarn);SYSLIB1054;CA1401</NoWarn>
@@ -93,6 +94,7 @@
       <PackagePath>runtimes/android-x86/native</PackagePath>
       <Pack>true</Pack>
     </None>
+    <EmbeddedJar Include="Jars\SDL3AndroidBridge.jar" />
   </ItemGroup>
 
 </Project>