Skip to content

Commit

Permalink
java rpi5 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ksyeo1010 committed Jan 31, 2024
1 parent 4a5694c commit 48700af
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 11 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/java-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 8 additions & 2 deletions demo/java-swing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ plugins {

repositories {
mavenCentral()
maven {
url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1313/'
}
maven {
url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1314/'
}
}

sourceSets {
Expand All @@ -18,13 +24,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'
}
12 changes: 9 additions & 3 deletions demo/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ plugins {

repositories {
mavenCentral()
maven {
url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1313/'
}
maven {
url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1314/'
}
}

sourceSets {
Expand All @@ -15,14 +21,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"
Expand All @@ -34,7 +40,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"
Expand Down
2 changes: 1 addition & 1 deletion sdk/java/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 6 additions & 3 deletions sdk/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand All @@ -18,6 +18,9 @@ java {

repositories {
mavenCentral()
maven {
url 'https://s01.oss.sonatype.org/content/repositories/aipicovoice-1313/'
}
}

sourceSets {
Expand All @@ -40,8 +43,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'
Expand Down

0 comments on commit 48700af

Please sign in to comment.