From b5c66c40c6d08f3796348661ddb3d0fbe9bbae08 Mon Sep 17 00:00:00 2001 From: Naohide Sano Date: Sat, 14 Dec 2024 16:07:06 +0900 Subject: [PATCH] update settings --- .github/workflows/codeql-analysis.yml | 4 +- .github/workflows/maven.yml | 4 +- README.md | 26 ++++++---- jitpack.yml | 2 +- pom.xml | 69 ++++++++++----------------- src/test/resources/logging.properties | 2 +- 6 files changed, 48 insertions(+), 59 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 2958a9d..74c70c6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,10 +42,10 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven server-id: github # Value of the distributionManagement/repository/id field of the pom.xml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e68c2d0..3243b2f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -22,10 +22,10 @@ jobs: if: ${{ contains(github.event.head_commit.message, 'bump version') }} run: grep "" pom.xml | head -1 | grep -v SNAPSHOT - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven server-id: github # Value of the distributionManagement/repository/id field of the pom.xml diff --git a/README.md b/README.md index 018b656..a49d9c7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![Release](https://jitpack.io/v/umjammer/vavi-speech2.svg)](https://jitpack.io/#umjammer/vavi-speech2) [![Java CI](https://github.com/umjammer/vavi-speech2/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-speech2/actions/workflows/maven.yml) [![CodeQL](https://github.com/umjammer/vavi-speech2/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/umjammer/vavi-speech2/actions/workflows/codeql-analysis.yml) -![Java](https://img.shields.io/badge/Java-17-b07219) +![Java](https://img.shields.io/badge/Java-21-b07219) # vavi-speech2 @@ -10,14 +10,15 @@ Text to Speech and Speech to Text (JSAPI2) engines for Java | **Type** | **Description** | **Sythesizer** | **Recognizer** | **Quality** | **Comment** | -|:----------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------:|:--------------:|:-----------:|:------------| -| AquesTalk10 | [AquesTalk](https://www.a-quest.com/products/aquestalk.html), JNA | โœ… | - | ๐Ÿ˜ | ใ‚†ใฃใใ‚Š | -| Google Cloud Text To Speech | [Google Cloud Text To Speech](https://cloud.google.com/text-to-speech/docs/quickstart-client-libraries), Library | โœ… | ๐Ÿšง | ๐Ÿ‘‘ | | -| Cocoa | [Rococoa](https://github.com/iterate-ch/rococoa/blob/d5fdd3b884d5f044bc0b168aff66e5f52a014da8/rococoa/rococoa-contrib/src/test/java/org/rococoa/contrib/appkit/NSSpeechSynthesizerTest.java), JNA | โœ… | ๐Ÿšซ | ๐Ÿ˜ƒ | | -| Open JTalk | [jtalkdll](https://github.com/rosmarinus/jtalkdll), JNA | โœ… | - | ๐Ÿ’ฉ | | -| VoiceVox | [VOICEVOX](https://voicevox.hiroshiba.jp/), REST | โœ… | - | ๐Ÿ˜ƒ | ใšใ‚“ใ ใ‚‚ใ‚“ | -| CoeiroInk | [CoeiroInk](https://coeiroink.com/), REST | โœ… | - | ๐Ÿ˜ƒ | ใคใใ‚ˆใฟใกใ‚ƒใ‚“ | -| Gyutan (Open JTalk in Java) | [Gyutan](https://github.com/umjammer/Gyutan), Library | โœ… | - | ๐Ÿ’ฉ | | +|:----------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------:|:--------------:|:-----------:|:------------| +| AquesTalk10 | [AquesTalk](https://www.a-quest.com/products/aquestalk.html), JNA | โœ… | - | ๐Ÿ˜ | ใ‚†ใฃใใ‚Š | +| Google Cloud Text To Speech | [Google Cloud Text To Speech](https://cloud.google.com/text-to-speech/docs/quickstart-client-libraries), Library | โœ… | ๐Ÿšง | ๐Ÿ‘‘ | | +| Cocoa | [Rococoa](https://github.com/iterate-ch/rococoa/blob/d5fdd3b884d5f044bc0b168aff66e5f52a014da8/rococoa/rococoa-contrib/src/test/java/org/rococoa/contrib/appkit/NSSpeechSynthesizerTest.java), JNA | โœ… | ๐Ÿšซ | ๐Ÿ˜ƒ | | +| Open JTalk | [jtalkdll](https://github.com/rosmarinus/jtalkdll), JNA | โœ… | - | ๐Ÿ’ฉ | | +| VoiceVox | [VOICEVOX](https://voicevox.hiroshiba.jp/), REST | โœ… | - | ๐Ÿ˜ƒ | ใšใ‚“ใ ใ‚‚ใ‚“ | +| CoeiroInk | [CoeiroInk](https://coeiroink.com/), REST | โœ… | - | ๐Ÿ˜ƒ | ใคใใ‚ˆใฟใกใ‚ƒใ‚“ | +| Gyutan (Open JTalk in Java) | [Gyutan](https://github.com/umjammer/Gyutan), Library | โœ… | - | ๐Ÿ’ฉ | | +| AivisSpeech | [Aivis Project](https://aivis-project.com/), REST | โœ… | - | ๐Ÿ‘‘ | | ## Install @@ -55,6 +56,11 @@ Text to Speech and Speech to Text (JSAPI2) engines for Java * https://agentcraft.sebastien.ai/ +### AivisSpeech + +* [download](https://aivis-project.com/) the application +* run the application before using this library + ## Usage ### user @@ -99,4 +105,4 @@ Text to Speech and Speech to Text (JSAPI2) engines for Java * ~~rcp client/server (wip)~~ -> [vavi-speech-rpc](https://github.com/umjammer/vavi-speech-rpc) --- -images by ้œŠๅคข, ้ญ”็†ๆฒ™, ใšใ‚“ใ ใ‚‚ใ‚“ \ No newline at end of file +images by ้œŠๅคข, ้ญ”็†ๆฒ™, ใšใ‚“ใ ใ‚‚ใ‚“ diff --git a/jitpack.yml b/jitpack.yml index efde7bf..727c9ab 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,2 +1,2 @@ jdk: - - openjdk17 + - openjdk21 diff --git a/pom.xml b/pom.xml index ff0c785..d6f7828 100644 --- a/pom.xml +++ b/pom.xml @@ -24,27 +24,23 @@ com.github.umjammer.jsapi2 0.6.10 - 3.1.5 + 3.1.7 - local (not on CI) + local ${basedir}/local.properties - - env.JITPACK - !true - org.codehaus.mojo properties-maven-plugin - 1.1.0 + 1.2.1 read-properties @@ -64,15 +60,10 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.2 + 3.2.5 false false - - ${sen.home} - ${voicevox.url} - ${htsvoice.dir} - ${google.credential} ${docomo.goo.hiragana.apiKey} @@ -80,7 +71,10 @@ -Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties - -Dvavi.util.logging.VaviFormatter.extraClassMethod=sun\\.util\\.logging\\.internal\\.LoggingProviderImpl.*r#log + -Dvavi.util.logging.VaviFormatter.extraClassMethod=sun\.util\.logging\.internal\.LoggingProviderImpl.*r#log + -Dsen.home=@{sen.home} + -Dvavi.speech.voicevox.url=@{voicevox.url} + -Dhtsvoice.dir=@{htsvoice.dir} **/*Test_*.java @@ -164,9 +158,9 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.12.1 - 17 + 21 @@ -177,11 +171,6 @@ jitpack.io https://jitpack.io - - maven_central - Maven Central - https://repo.maven.apache.org/maven2/ - @@ -189,7 +178,7 @@ com.google.cloud libraries-bom - 26.13.0 + 26.43.0 pom import @@ -197,7 +186,7 @@ org.junit junit-bom - 5.10.2 + 5.10.3 pom import @@ -223,11 +212,20 @@ 0.8.13 + + com.google.cloud + google-cloud-speech + + com.github.umjammer vavi-speech - 0.1.12 + 0.1.13 + + com.google.protobuf + protobuf-java + com.github.umjammer javax-speech @@ -236,29 +234,14 @@ com.github.umjammer.FreeTTS freetts-jsapi10 - - guava - com.google.guava - - guava - com.google.guava - 33.1.0-jre + com.google.protobuf + protobuf-java + 3.25.5 - - com.google.cloud - google-cloud-speech - - - guava - com.google.guava - - - - org.glassfish.jersey.core jersey-client @@ -300,7 +283,7 @@ org.slf4j slf4j-jdk14 - 2.0.13 + 2.0.16 test diff --git a/src/test/resources/logging.properties b/src/test/resources/logging.properties index a93f648..a992dff 100644 --- a/src/test/resources/logging.properties +++ b/src/test/resources/logging.properties @@ -2,9 +2,9 @@ handlers=java.util.logging.ConsoleHandler .level=INFO java.util.logging.ConsoleHandler.level=ALL java.util.logging.ConsoleHandler.formatter=vavi.util.logging.VaviFormatter -java.util.logging.ConsoleHandler.encoding=UTF-8 vavi.util.level=FINER +vavi.speech.level=FINER org.rococoa.level=OFF #org.jvoicexml.level=ALL #javax.speech.level=ALL