From bc1b34d814911919ccaf0f972ce2f4b643b1030f Mon Sep 17 00:00:00 2001
From: Kwangsoo Yeo <kyeo@picovoice.ai>
Date: Wed, 31 Jan 2024 12:29:48 -0800
Subject: [PATCH] java rpi5 support (#777)

---
 .github/workflows/java-demos.yml                        | 4 +++-
 .github/workflows/java.yml                              | 2 +-
 demo/java-swing/build.gradle                            | 4 ++--
 demo/java/build.gradle                                  | 6 +++---
 sdk/java/README.md                                      | 2 +-
 sdk/java/build.gradle                                   | 6 +++---
 sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java | 1 +
 7 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/java-demos.yml b/.github/workflows/java-demos.yml
index 0dc41d13a..ca4a923a6 100644
--- a/.github/workflows/java-demos.yml
+++ b/.github/workflows/java-demos.yml
@@ -64,7 +64,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone]
+        machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
         include:
         - machine: rpi2
           platform: raspberry-pi
@@ -76,6 +76,8 @@ jobs:
           platform: raspberry-pi
         - machine: rpi4-64
           platform: raspberry-pi
+        - machine: rpi5-64
+          platform: raspberry-pi
         - machine: jetson
           platform: jetson
         - machine: beaglebone
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 0eca1c7dd..d04efb062 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -57,7 +57,7 @@ jobs:
 
     strategy:
       matrix:
-        machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, jetson, beaglebone]
+        machine: [rpi2, rpi3-32, rpi3-64, rpi4-32, rpi4-64, rpi5-64, jetson, beaglebone]
 
     steps:
     - uses: actions/checkout@v3
diff --git a/demo/java-swing/build.gradle b/demo/java-swing/build.gradle
index a376f0d31..d0d289490 100644
--- a/demo/java-swing/build.gradle
+++ b/demo/java-swing/build.gradle
@@ -18,13 +18,13 @@ sourceSets {
 jar {
     manifest {
         attributes 'Main-Class': 'Main',
-                "Class-Path": "picovoice-3.0.1.jar;commons-cli-1.4.jar"
+                "Class-Path": "picovoice-3.0.2.jar;commons-cli-1.4.jar"
     }
     from {configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
 }
 
 
 dependencies {
-    implementation 'ai.picovoice:picovoice-java:3.0.1'
+    implementation 'ai.picovoice:picovoice-java:3.0.2'
     implementation 'commons-cli:commons-cli:1.4'
 }
diff --git a/demo/java/build.gradle b/demo/java/build.gradle
index 620d09ff0..5d0739749 100644
--- a/demo/java/build.gradle
+++ b/demo/java/build.gradle
@@ -15,14 +15,14 @@ sourceSets {
 }
 
 dependencies {
-    implementation 'ai.picovoice:picovoice-java:3.0.1'
+    implementation 'ai.picovoice:picovoice-java:3.0.2'
     implementation 'commons-cli:commons-cli:1.4'
 }
 
 jar {
     manifest {
         attributes "Main-Class": "ai.picovoice.picovoicedemo.MicDemo",
-                   "Class-Path" : "picovoice-3.0.1.jar;commons-cli-1.4.jar"
+                   "Class-Path" : "picovoice-3.0.2.jar;commons-cli-1.4.jar"
     }
     from sourceSets.main.output
     exclude "**/FileDemo.class"
@@ -34,7 +34,7 @@ jar {
 task fileDemoJar(type: Jar) {
     manifest {
         attributes "Main-Class": "ai.picovoice.picovoicedemo.FileDemo",
-                   "Class-Path" : "picovoice-3.0.1.jar;commons-cli-1.4.jar"
+                   "Class-Path" : "picovoice-3.0.2.jar;commons-cli-1.4.jar"
     }
     from sourceSets.main.output
     exclude "**/MicDemo.class"
diff --git a/sdk/java/README.md b/sdk/java/README.md
index 142b19e6d..9a6e75e1a 100644
--- a/sdk/java/README.md
+++ b/sdk/java/README.md
@@ -22,7 +22,7 @@ Picovoice is:
 - Linux (x86_64)
 - macOS (x86_64, arm64)
 - Windows (x86_64)
-- Raspberry Pi 2, Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit)
+- Raspberry Pi 2, Raspberry Pi 3 (32 and 64 bit), Raspberry Pi 4 (32 and 64 bit), Raspberry Pi 5 (32 and 64 bit)
 - Jetson Nano
 - BeagleBone
 
diff --git a/sdk/java/build.gradle b/sdk/java/build.gradle
index f42c21425..6ae1f6989 100644
--- a/sdk/java/build.gradle
+++ b/sdk/java/build.gradle
@@ -7,7 +7,7 @@ plugins {
 
 ext {
     PUBLISH_GROUP_ID = 'ai.picovoice'
-    PUBLISH_VERSION = '3.0.1'
+    PUBLISH_VERSION = '3.0.2'
     PUBLISH_ARTIFACT_ID = 'picovoice-java'
 }
 
@@ -40,8 +40,8 @@ if (file("${rootDir}/publish-mavencentral.gradle").exists()) {
 }
 
 dependencies {
-    implementation 'ai.picovoice:porcupine-java:3.0.1'
-    implementation 'ai.picovoice:rhino-java:3.0.1'
+    implementation 'ai.picovoice:porcupine-java:3.0.2'
+    implementation 'ai.picovoice:rhino-java:3.0.2'
     testImplementation 'com.google.code.gson:gson:2.10.1'
     testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.8.2'
diff --git a/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java b/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java
index 36dcc89e1..aafccade0 100644
--- a/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java
+++ b/sdk/java/test/ai/picovoice/picovoice/PicovoiceTest.java
@@ -287,6 +287,7 @@ private static String getEnvironmentName() throws RuntimeException {
                     case "0xc07":
                     case "0xd03":
                     case "0xd08":
+                    case "0xd0b":
                         return "raspberry-pi";
                     case "0xd07":
                         return "jetson";