Skip to content

Commit 49fd015

Browse files
authored
Merge pull request #22 from umjammer/0.0.19
0.0.19
2 parents e71be0f + b5c66c4 commit 49fd015

32 files changed

+1010
-185
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ jobs:
4242

4343
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4444
# If this step fails, then you should remove it and run the build manually (see below)
45-
- name: Set up JDK 17
45+
- name: Set up JDK 21
4646
uses: actions/setup-java@v4
4747
with:
48-
java-version: '17'
48+
java-version: '21'
4949
distribution: 'temurin'
5050
cache: maven
5151
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml

.github/workflows/maven.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
if: ${{ contains(github.event.head_commit.message, 'bump version') }}
2323
run: grep "<version>" pom.xml | head -1 | grep -v SNAPSHOT
2424

25-
- name: Set up JDK 17
25+
- name: Set up JDK 21
2626
uses: actions/setup-java@v4
2727
with:
28-
java-version: '17'
28+
java-version: '21'
2929
distribution: 'temurin'
3030
cache: maven
3131
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml

README.md

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[![Release](https://jitpack.io/v/umjammer/vavi-speech2.svg)](https://jitpack.io/#umjammer/vavi-speech2)
22
[![Java CI](https://github.com/umjammer/vavi-speech2/actions/workflows/maven.yml/badge.svg)](https://github.com/umjammer/vavi-speech2/actions/workflows/maven.yml)
33
[![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)
4-
![Java](https://img.shields.io/badge/Java-17-b07219)
4+
![Java](https://img.shields.io/badge/Java-21-b07219)
55

66
# vavi-speech2
77

@@ -10,14 +10,15 @@
1010
Text to Speech and Speech to Text (JSAPI2) engines for Java
1111

1212
| **Type** | **Description** | **Sythesizer** | **Recognizer** | **Quality** | **Comment** |
13-
|:----------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------:|:--------------:|:-----------:|:------------|
14-
| AquesTalk10 | [AquesTalk](https://www.a-quest.com/products/aquestalk.html), JNA || - | 😐 | ゆっくり |
15-
| Google Cloud Text To Speech | [Google Cloud Text To Speech](https://cloud.google.com/text-to-speech/docs/quickstart-client-libraries), Library || 🚧 | 👑 | |
16-
| Cocoa | [Rococoa](https://github.com/iterate-ch/rococoa/blob/d5fdd3b884d5f044bc0b168aff66e5f52a014da8/rococoa/rococoa-contrib/src/test/java/org/rococoa/contrib/appkit/NSSpeechSynthesizerTest.java), JNA || 🚫 | 😃 | |
17-
| Open JTalk | [jtalkdll](https://github.com/rosmarinus/jtalkdll), JNA || - | 💩 | |
18-
| VoiceVox | [VOICEVOX](https://voicevox.hiroshiba.jp/), REST || - | 😃 | ずんだもん |
19-
| CoeiroInk | [CoeiroInk](https://coeiroink.com/), REST || - | 😃 | つくよみちゃん |
20-
| Gyutan (Open JTalk in Java) | [Gyutan](https://github.com/umjammer/Gyutan), Library || - | 💩 | |
13+
|:----------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:--------------:|:--------------:|:-----------:|:------------|
14+
| AquesTalk10 | [AquesTalk](https://www.a-quest.com/products/aquestalk.html), JNA || - | 😐 | ゆっくり |
15+
| Google Cloud Text To Speech | [Google Cloud Text To Speech](https://cloud.google.com/text-to-speech/docs/quickstart-client-libraries), Library || 🚧 | 👑 | |
16+
| Cocoa | [Rococoa](https://github.com/iterate-ch/rococoa/blob/d5fdd3b884d5f044bc0b168aff66e5f52a014da8/rococoa/rococoa-contrib/src/test/java/org/rococoa/contrib/appkit/NSSpeechSynthesizerTest.java), JNA || 🚫 | 😃 | |
17+
| Open JTalk | [jtalkdll](https://github.com/rosmarinus/jtalkdll), JNA || - | 💩 | |
18+
| VoiceVox | [VOICEVOX](https://voicevox.hiroshiba.jp/), REST || - | 😃 | ずんだもん |
19+
| CoeiroInk | [CoeiroInk](https://coeiroink.com/), REST || - | 😃 | つくよみちゃん |
20+
| Gyutan (Open JTalk in Java) | [Gyutan](https://github.com/umjammer/Gyutan), Library || - | 💩 | |
21+
| AivisSpeech | [Aivis Project](https://aivis-project.com/), REST || - | 👑 | |
2122

2223
## Install
2324

@@ -55,6 +56,11 @@ Text to Speech and Speech to Text (JSAPI2) engines for Java
5556

5657
* https://agentcraft.sebastien.ai/
5758

59+
### AivisSpeech
60+
61+
* [download](https://aivis-project.com/) the application
62+
* run the application before using this library
63+
5864
## Usage
5965

6066
### user
@@ -99,4 +105,4 @@ Text to Speech and Speech to Text (JSAPI2) engines for Java
99105
* ~~rcp client/server (wip)~~ -> [vavi-speech-rpc](https://github.com/umjammer/vavi-speech-rpc)
100106

101107
---
102-
<sub>images by <a href="https://commons.nicovideo.jp/works/nc327182">霊夢</a>, <a href="https://commons.nicovideo.jp/works/nc327184">魔理沙</a>, <a href="https://seiga.nicovideo.jp/seiga/im10865385">ずんだもん</a></sub>
108+
<sub>images by <a href="https://commons.nicovideo.jp/works/nc327182">霊夢</a>, <a href="https://commons.nicovideo.jp/works/nc327184">魔理沙</a>, <a href="https://seiga.nicovideo.jp/seiga/im10865385">ずんだもん</a></sub>

jitpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
jdk:
2-
- openjdk17
2+
- openjdk21

pom.xml

Lines changed: 26 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,23 @@
2424
<jsapi2.groupId>com.github.umjammer.jsapi2</jsapi2.groupId> <!-- org.jvoicexml / com.github.umjammer.jsapi2 -->
2525
<jsapi2.version>0.6.10</jsapi2.version>
2626

27-
<jersey.version>3.1.5</jersey.version>
27+
<jersey.version>3.1.7</jersey.version>
2828
</properties>
2929

3030
<profiles>
3131
<profile>
32-
<id>local (not on CI)</id>
32+
<id>local</id>
3333
<activation>
3434
<file>
3535
<exists>${basedir}/local.properties</exists>
3636
</file>
37-
<property>
38-
<name>env.JITPACK</name>
39-
<value>!true</value>
40-
</property>
4137
</activation>
4238
<build>
4339
<plugins>
4440
<plugin>
4541
<groupId>org.codehaus.mojo</groupId>
4642
<artifactId>properties-maven-plugin</artifactId>
47-
<version>1.1.0</version>
43+
<version>1.2.1</version>
4844
<executions>
4945
<execution>
5046
<id>read-properties</id>
@@ -64,23 +60,21 @@
6460
<!-- don't touch: this works well on github actions -->
6561
<groupId>org.apache.maven.plugins</groupId>
6662
<artifactId>maven-surefire-plugin</artifactId>
67-
<version>3.2.2</version>
63+
<version>3.2.5</version>
6864
<configuration>
6965
<reuseForks>false</reuseForks>
7066
<trimStackTrace>false</trimStackTrace>
71-
<systemProperties>
72-
<sen.home>${sen.home}</sen.home>
73-
<vavi.speech.voicevox.url>${voicevox.url}</vavi.speech.voicevox.url>
74-
<htsvoice.dir>${htsvoice.dir}</htsvoice.dir>
75-
</systemProperties>
7667
<environmentVariables>
7768
<GOOGLE_APPLICATION_CREDENTIALS>${google.credential}</GOOGLE_APPLICATION_CREDENTIALS>
7869
<DOCOMO_GOO_HIRAGANA_API_KEY>${docomo.goo.hiragana.apiKey}</DOCOMO_GOO_HIRAGANA_API_KEY>
7970
<YAHOOJAPAN_API_KEY>${yahoo.japan.apiKey}</YAHOOJAPAN_API_KEY>
8071
</environmentVariables>
8172
<argLine>
8273
-Djava.util.logging.config.file=${project.build.testOutputDirectory}/logging.properties
83-
-Dvavi.util.logging.VaviFormatter.extraClassMethod=sun\\.util\\.logging\\.internal\\.LoggingProviderImpl.*r#log
74+
-Dvavi.util.logging.VaviFormatter.extraClassMethod=sun\.util\.logging\.internal\.LoggingProviderImpl.*r#log
75+
-Dsen.home=@{sen.home}
76+
-Dvavi.speech.voicevox.url=@{voicevox.url}
77+
-Dhtsvoice.dir=@{htsvoice.dir}
8478
</argLine>
8579
<includes>
8680
<include>**/*Test_*.java</include>
@@ -164,9 +158,9 @@
164158
<plugin>
165159
<groupId>org.apache.maven.plugins</groupId>
166160
<artifactId>maven-compiler-plugin</artifactId>
167-
<version>3.11.0</version>
161+
<version>3.12.1</version>
168162
<configuration>
169-
<release>17</release>
163+
<release>21</release>
170164
</configuration>
171165
</plugin>
172166
</plugins>
@@ -177,27 +171,22 @@
177171
<id>jitpack.io</id>
178172
<url>https://jitpack.io</url>
179173
</repository>
180-
<repository>
181-
<id>maven_central</id>
182-
<name>Maven Central</name>
183-
<url>https://repo.maven.apache.org/maven2/</url>
184-
</repository>
185174
</repositories>
186175

187176
<dependencyManagement>
188177
<dependencies>
189178
<dependency>
190179
<groupId>com.google.cloud</groupId>
191180
<artifactId>libraries-bom</artifactId>
192-
<version>26.13.0</version>
181+
<version>26.43.0</version>
193182
<type>pom</type>
194183
<scope>import</scope>
195184
</dependency>
196185

197186
<dependency>
198187
<groupId>org.junit</groupId>
199188
<artifactId>junit-bom</artifactId>
200-
<version>5.10.2</version>
189+
<version>5.10.3</version>
201190
<type>pom</type>
202191
<scope>import</scope>
203192
</dependency>
@@ -223,11 +212,20 @@
223212
<version>0.8.13</version>
224213
</dependency>
225214

215+
<dependency>
216+
<groupId>com.google.cloud</groupId>
217+
<artifactId>google-cloud-speech</artifactId>
218+
</dependency>
219+
226220
<dependency>
227221
<groupId>com.github.umjammer</groupId> <!-- vavi / com.github.umjammer -->
228222
<artifactId>vavi-speech</artifactId>
229-
<version>0.1.12</version>
223+
<version>0.1.13</version>
230224
<exclusions>
225+
<exclusion>
226+
<groupId>com.google.protobuf</groupId>
227+
<artifactId>protobuf-java</artifactId>
228+
</exclusion>
231229
<exclusion>
232230
<groupId>com.github.umjammer</groupId>
233231
<artifactId>javax-speech</artifactId>
@@ -236,29 +234,14 @@
236234
<groupId>com.github.umjammer.FreeTTS</groupId>
237235
<artifactId>freetts-jsapi10</artifactId>
238236
</exclusion>
239-
<exclusion>
240-
<artifactId>guava</artifactId>
241-
<groupId>com.google.guava</groupId>
242-
</exclusion>
243237
</exclusions>
244238
</dependency>
245239
<dependency>
246-
<artifactId>guava</artifactId>
247-
<groupId>com.google.guava</groupId>
248-
<version>33.1.0-jre</version>
240+
<groupId>com.google.protobuf</groupId>
241+
<artifactId>protobuf-java</artifactId>
242+
<version>3.25.5</version>
249243
</dependency>
250244

251-
<dependency>
252-
<groupId>com.google.cloud</groupId>
253-
<artifactId>google-cloud-speech</artifactId>
254-
<exclusions>
255-
<exclusion>
256-
<artifactId>guava</artifactId>
257-
<groupId>com.google.guava</groupId>
258-
</exclusion>
259-
</exclusions>
260-
</dependency>
261-
262245
<dependency>
263246
<groupId>org.glassfish.jersey.core</groupId>
264247
<artifactId>jersey-client</artifactId>
@@ -300,7 +283,7 @@
300283
<dependency>
301284
<groupId>org.slf4j</groupId>
302285
<artifactId>slf4j-jdk14</artifactId>
303-
<version>2.0.13</version>
286+
<version>2.0.16</version>
304287
<scope>test</scope>
305288
</dependency>
306289
</dependencies>

src/main/java/vavi/speech/BaseEnginFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ protected EngineList createEngineListForSynthesizer(EngineMode require) {
129129
try {
130130
voices = geAlltVoices();
131131
} catch (Throwable t) {
132-
logger.log(Level.WARNING, t.getMessage(), t);
132+
logger.log(Level.WARNING, t.getMessage());
133+
logger.log(Level.TRACE, t.getMessage(), t);
133134
}
134135
if (voices == null)
135136
voices = Collections.emptyList();

0 commit comments

Comments
 (0)