From d67befa24e6cd07756f078b521475631b1bde992 Mon Sep 17 00:00:00 2001 From: Windymelt Date: Sun, 24 Mar 2024 03:40:10 +0900 Subject: [PATCH 1/2] rename package --- build.sbt | 2 +- .../windymelt => dev/capslock}/voicevoxcore4s/CoreJ.java | 4 ++-- .../windymelt => dev/capslock}/voicevoxcore4s/Core.scala | 9 ++++----- .../capslock}/voicevoxcore4s/Logger.scala | 2 +- .../windymelt => dev/capslock}/voicevoxcore4s/Main.scala | 2 +- .../windymelt => dev/capslock}/voicevoxcore4s/Util.scala | 2 +- .../capslock}/voicevoxcore4s/CoreSpec.scala | 5 ++--- 7 files changed, 12 insertions(+), 14 deletions(-) rename src/main/java/{com/github/windymelt => dev/capslock}/voicevoxcore4s/CoreJ.java (97%) rename src/main/scala/{com/github/windymelt => dev/capslock}/voicevoxcore4s/Core.scala (97%) rename src/main/scala/{com/github/windymelt => dev/capslock}/voicevoxcore4s/Logger.scala (65%) rename src/main/scala/{com/github/windymelt => dev/capslock}/voicevoxcore4s/Main.scala (97%) rename src/main/scala/{com/github/windymelt => dev/capslock}/voicevoxcore4s/Util.scala (98%) rename src/test/scala/{com/github/windymelt => dev/capslock}/voicevoxcore4s/CoreSpec.scala (93%) diff --git a/build.sbt b/build.sbt index 5de4759..2d8bb72 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ lazy val downloadCore = Compile / compile := (Compile / compile).dependsOn(downloadCore).value -buildInfoPackage := "com.github.windymelt.voicevoxcore4s" +buildInfoPackage := "dev.capslock.voicevoxcore4s" lazy val common = project .settings( diff --git a/src/main/java/com/github/windymelt/voicevoxcore4s/CoreJ.java b/src/main/java/dev/capslock/voicevoxcore4s/CoreJ.java similarity index 97% rename from src/main/java/com/github/windymelt/voicevoxcore4s/CoreJ.java rename to src/main/java/dev/capslock/voicevoxcore4s/CoreJ.java index 1bec1cf..d2447f9 100644 --- a/src/main/java/com/github/windymelt/voicevoxcore4s/CoreJ.java +++ b/src/main/java/dev/capslock/voicevoxcore4s/CoreJ.java @@ -1,4 +1,4 @@ -package com.github.windymelt.voicevoxcore4s; +package dev.capslock.voicevoxcore4s; import com.sun.jna.Structure; import java.util.Arrays; @@ -58,4 +58,4 @@ protected List getFieldOrder() { return Arrays.asList("kana", "enable_interrogative_upspeak"); } } -} \ No newline at end of file +} diff --git a/src/main/scala/com/github/windymelt/voicevoxcore4s/Core.scala b/src/main/scala/dev/capslock/voicevoxcore4s/Core.scala similarity index 97% rename from src/main/scala/com/github/windymelt/voicevoxcore4s/Core.scala rename to src/main/scala/dev/capslock/voicevoxcore4s/Core.scala index 86a467a..52fe3d6 100644 --- a/src/main/scala/com/github/windymelt/voicevoxcore4s/Core.scala +++ b/src/main/scala/dev/capslock/voicevoxcore4s/Core.scala @@ -1,4 +1,4 @@ -package com.github.windymelt.voicevoxcore4s +package dev.capslock.voicevoxcore4s import com.sun.jna.Library import com.sun.jna.Library.OPTION_FUNCTION_MAPPER @@ -18,8 +18,7 @@ import java.{util => ju} // cf. https://github.com/VOICEVOX/voicevox_core/blob/0.14.1/core/src/core.h // cf. https://voicevox.github.io/voicevox_core/apis/c_api/voicevox__core_8h.html -/** - * VOICEVOX CoreライブラリのJNAによるラッパー。純粋にラッパーとして振る舞うため、元ライブラリに忠実に振る舞う。 +/** VOICEVOX CoreライブラリのJNAによるラッパー。純粋にラッパーとして振る舞うため、元ライブラリに忠実に振る舞う。 */ trait Core extends Library { def voicevox_audio_query( @@ -123,8 +122,8 @@ trait Core extends Library { } object Core { - /** - * 関数/メソッド名を変換する層。かつてのバージョンのCoreでJavaの予約語に関数名が被っていた名残として用意している。 + + /** 関数/メソッド名を変換する層。かつてのバージョンのCoreでJavaの予約語に関数名が被っていた名残として用意している。 */ private val functionMap = new com.sun.jna.FunctionMapper { def getFunctionName(library: NativeLibrary, method: Method): String = diff --git a/src/main/scala/com/github/windymelt/voicevoxcore4s/Logger.scala b/src/main/scala/dev/capslock/voicevoxcore4s/Logger.scala similarity index 65% rename from src/main/scala/com/github/windymelt/voicevoxcore4s/Logger.scala rename to src/main/scala/dev/capslock/voicevoxcore4s/Logger.scala index 4477ed7..7d3e92e 100644 --- a/src/main/scala/com/github/windymelt/voicevoxcore4s/Logger.scala +++ b/src/main/scala/dev/capslock/voicevoxcore4s/Logger.scala @@ -1,4 +1,4 @@ -package com.github.windymelt.voicevoxcore4s +package dev.capslock.voicevoxcore4s object Logger { val logger = com.typesafe.scalalogging.Logger("voicevoxcore4s") diff --git a/src/main/scala/com/github/windymelt/voicevoxcore4s/Main.scala b/src/main/scala/dev/capslock/voicevoxcore4s/Main.scala similarity index 97% rename from src/main/scala/com/github/windymelt/voicevoxcore4s/Main.scala rename to src/main/scala/dev/capslock/voicevoxcore4s/Main.scala index 71bd1be..3f5dc0c 100644 --- a/src/main/scala/com/github/windymelt/voicevoxcore4s/Main.scala +++ b/src/main/scala/dev/capslock/voicevoxcore4s/Main.scala @@ -1,4 +1,4 @@ -package com.github.windymelt.voicevoxcore4s +package dev.capslock.voicevoxcore4s import com.sun.jna.ptr.{PointerByReference, IntByReference, LongByReference} import java.io.FileOutputStream diff --git a/src/main/scala/com/github/windymelt/voicevoxcore4s/Util.scala b/src/main/scala/dev/capslock/voicevoxcore4s/Util.scala similarity index 98% rename from src/main/scala/com/github/windymelt/voicevoxcore4s/Util.scala rename to src/main/scala/dev/capslock/voicevoxcore4s/Util.scala index c0a16f1..0c1235b 100644 --- a/src/main/scala/com/github/windymelt/voicevoxcore4s/Util.scala +++ b/src/main/scala/dev/capslock/voicevoxcore4s/Util.scala @@ -1,4 +1,4 @@ -package com.github.windymelt.voicevoxcore4s +package dev.capslock.voicevoxcore4s import java.io.File import java.lang.invoke.MethodHandles diff --git a/src/test/scala/com/github/windymelt/voicevoxcore4s/CoreSpec.scala b/src/test/scala/dev/capslock/voicevoxcore4s/CoreSpec.scala similarity index 93% rename from src/test/scala/com/github/windymelt/voicevoxcore4s/CoreSpec.scala rename to src/test/scala/dev/capslock/voicevoxcore4s/CoreSpec.scala index 4cb713d..86ac0b6 100644 --- a/src/test/scala/com/github/windymelt/voicevoxcore4s/CoreSpec.scala +++ b/src/test/scala/dev/capslock/voicevoxcore4s/CoreSpec.scala @@ -1,12 +1,11 @@ -package com.github.windymelt.voicevoxcore4s +package dev.capslock.voicevoxcore4s import org.scalatest.flatspec.AnyFlatSpec import org.scalatest.matchers.should.Matchers import com.sun.jna.ptr.{PointerByReference, IntByReference} -/** - * 確実に一度だけライブラリをロードするためにObjectを使っている +/** 確実に一度だけライブラリをロードするためにObjectを使っている */ object TestRunner { val dictionaryDirectory = Util.extractDictFiles() From 869e4ffbd46b70b17faf1ae088590459dcae78e3 Mon Sep 17 00:00:00 2001 From: Windymelt Date: Sun, 24 Mar 2024 03:42:47 +0900 Subject: [PATCH 2/2] bump sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 46e43a9..abbbce5 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.2 +sbt.version=1.9.8