staged java

Picovoice · Jan 14, 2025 · 97fad9a · 97fad9a
1 parent 08b55c5
commit 97fad9a
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 32 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -71,6 +71,14 @@ jobs:
             binding-framework: net8.0
             test-framework: net8.0
         exclude:
+          - os: ubuntu-latest
+            dotnet-version: 2.1.x
+          - os: ubuntu-latest
+            dotnet-version: 3.0.x
+          - os: ubuntu-latest
+            dotnet-version: 3.1.x
+          - os: ubuntu-latest
+            dotnet-version: 5.0.x
           - os: macos-latest
             dotnet-version: 2.1.x
           - os: macos-latest
@@ -87,11 +95,17 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Setup .NET 8.0
+    - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: ${{ matrix.dotnet-version }}
 
+    - name: Set up .NET (8)
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.dotnet-version == '6.0.x' }}
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 8.0.x
+
     - name: Build binding
       run: dotnet build Rhino/Rhino.csproj --framework ${{ matrix.binding-framework }}
 

diff --git a/binding/dotnet/Rhino/Rhino.csproj b/binding/dotnet/Rhino/Rhino.csproj
@@ -62,9 +62,32 @@
             <Link>lib\windows\amd64\libpv_rhino.dll</Link>
             <Visible>false</Visible>
         </Content>
+        <Content Include="..\..\..\lib\mac\x86_64\libpv_rhino.dylib">
+            <PackagePath>
+                build/netstandard2.0/libpv_rhino.dylib;
+                build/netcoreapp3.0/lib/mac/x86_64/libpv_rhino.dylib;
+                build/net6.0/lib/mac/x86_64/libpv_rhino.dylib;
+                build/net8.0/lib/mac/x86_64/libpv_rhino.dylib;
+            </PackagePath>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>lib\mac\x86_64\libpv_rhino.dylib</Link>
+            <Visible>false</Visible>
+        </Content>
+    </ItemGroup>
+
+    <!--.NET 6.0+ libs-->
+    <ItemGroup>
+        <Content Include="..\..\..\lib\mac\arm64\libpv_rhino.dylib">
+            <PackagePath>
+                build/net6.0/lib/mac/arm64/libpv_rhino.dylib;
+                build/net8.0/lib/mac/arm64/libpv_rhino.dylib;
+            </PackagePath>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>lib\mac\arm64\libpv_rhino.dylib</Link>
+            <Visible>false</Visible>
+        </Content>
         <Content Include="..\..\..\lib\windows\arm64\libpv_rhino.dll">
             <PackagePath>
-                build/netcoreapp3.0/lib/windows/arm64/libpv_rhino.dll;
                 build/net6.0/lib/windows/arm64/libpv_rhino.dll;
                 build/net8.0/lib/windows/arm64/libpv_rhino.dll;
             </PackagePath>
@@ -74,30 +97,13 @@
         </Content>
         <Content Include="..\..\..\lib\linux\x86_64\libpv_rhino.so">
             <PackagePath>
-                build/netstandard2.0/libpv_rhino.so;
-                build/netcoreapp3.0/lib/linux/x86_64/libpv_rhino.so;
                 build/net6.0/lib/linux/x86_64/libpv_rhino.so;
                 build/net8.0/lib/linux/x86_64/libpv_rhino.so;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>lib\linux\x86_64\libpv_rhino.so</Link>
             <Visible>false</Visible>
         </Content>
-        <Content Include="..\..\..\lib\mac\x86_64\libpv_rhino.dylib">
-            <PackagePath>
-                build/netstandard2.0/libpv_rhino.dylib;
-                build/netcoreapp3.0/lib/mac/x86_64/libpv_rhino.dylib;
-                build/net6.0/lib/mac/x86_64/libpv_rhino.dylib;
-                build/net8.0/lib/mac/x86_64/libpv_rhino.dylib;
-            </PackagePath>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>lib\mac\x86_64\libpv_rhino.dylib</Link>
-            <Visible>false</Visible>
-        </Content>
-    </ItemGroup>
-
-    <!--.NET Core 3.0+ Libs-->
-    <ItemGroup>
         <Content Include="..\..\..\lib\raspberry-pi\**\*" Exclude="..\..\..\lib\raspberry-pi\arm11\*">
             <PackagePath>
                 build/netcoreapp3.0/lib/raspberry-pi;
@@ -110,19 +116,6 @@
         </Content>
     </ItemGroup>
 
-    <!--.NET 6.0+ libs-->
-    <ItemGroup>
-        <Content Include="..\..\..\lib\mac\arm64\libpv_rhino.dylib">
-            <PackagePath>
-                build/net6.0/lib/mac/arm64/libpv_rhino.dylib;
-                build/net8.0/lib/mac/arm64/libpv_rhino.dylib;
-            </PackagePath>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>lib\mac\arm64\libpv_rhino.dylib</Link>
-            <Visible>false</Visible>
-        </Content>
-    </ItemGroup>
-
     <!--Resources-->
     <ItemGroup>
         <Content Include="..\..\..\lib\common\rhino_params.pv">

diff --git a/demo/java/build.gradle b/demo/java/build.gradle
@@ -4,6 +4,9 @@ plugins {
 
 repositories {
     mavenCentral()
+    maven {
+        url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1363/'
+    }
 }
 
 sourceSets {