From de84df6940de6dab348a87de1c396fb0c28e54c7 Mon Sep 17 00:00:00 2001
From: Marvin Elsen <git@marvinelsen.com>
Date: Mon, 7 Oct 2024 21:00:13 +0200
Subject: [PATCH] Bump chinese-transliteration version

---
 build.gradle.kts                                          | 2 +-
 gradle/libs.versions.toml                                 | 2 +-
 src/main/kotlin/com/marvinelsen/cedict/api/CedictEntry.kt | 4 ++--
 .../com/marvinelsen/cedict/internal/RegexCedictParser.kt  | 6 +++---
 .../marvinelsen/cedict/internal/RegexCedictParserTest.kt  | 8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 906c886..18928c9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.marvinelsen"
-version = "2.0.0"
+version = "3.0.0"
 
 repositories {
     mavenCentral()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 5bb94f5..83e5c3d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 kotlin = "2.0.20"
 kotest = "5.9.1"
 detekt = "1.23.7"
-chinese-transliteration = "1.0.1"
+chinese-transliteration = "2.0.0"
 
 [libraries]
 chinese-transliteration = { module = "com.marvinelsen:chinese-transliteration", version.ref = "chinese-transliteration" }
diff --git a/src/main/kotlin/com/marvinelsen/cedict/api/CedictEntry.kt b/src/main/kotlin/com/marvinelsen/cedict/api/CedictEntry.kt
index 2a54ade..edb69ac 100644
--- a/src/main/kotlin/com/marvinelsen/cedict/api/CedictEntry.kt
+++ b/src/main/kotlin/com/marvinelsen/cedict/api/CedictEntry.kt
@@ -1,10 +1,10 @@
 package com.marvinelsen.cedict.api
 
-import com.marvinelsen.chinese.transliteration.Syllable
+import com.marvinelsen.chinese.transliteration.api.PinyinSyllable
 
 data class CedictEntry(
     val traditional: String,
     val simplified: String,
-    val pinyinSyllables: List<Syllable>,
+    val pinyinSyllables: List<PinyinSyllable>,
     val definitions: List<CedictDefinition>,
 )
diff --git a/src/main/kotlin/com/marvinelsen/cedict/internal/RegexCedictParser.kt b/src/main/kotlin/com/marvinelsen/cedict/internal/RegexCedictParser.kt
index ae72d1e..9181e1e 100644
--- a/src/main/kotlin/com/marvinelsen/cedict/internal/RegexCedictParser.kt
+++ b/src/main/kotlin/com/marvinelsen/cedict/internal/RegexCedictParser.kt
@@ -3,7 +3,7 @@ package com.marvinelsen.cedict.internal
 import com.marvinelsen.cedict.api.CedictDefinition
 import com.marvinelsen.cedict.api.CedictEntry
 import com.marvinelsen.cedict.api.CedictParser
-import com.marvinelsen.chinese.transliteration.Syllable
+import com.marvinelsen.chinese.transliteration.api.PinyinSyllable
 import java.io.InputStream
 
 internal class RegexCedictParser : CedictParser {
@@ -43,8 +43,8 @@ internal class RegexCedictParser : CedictParser {
 
     private fun toPinyinSyllables(pinyinWithNumbers: String) = pinyinWithNumbers
         .split(" ")
-        .filter { Syllable.isValidPinyinWithToneNumberSyllable(it) }
-        .map { Syllable.fromPinyinWithToneNumber(it) }
+        .filter { PinyinSyllable.isValidPinyinWithToneNumberSyllable(it) }
+        .map { PinyinSyllable.fromPinyinWithToneNumber(it) }
 
     private fun toCedictDefinitions(definitions: String) = definitions
         .split(DEFINITION_SEPARATOR)
diff --git a/src/test/kotlin/com/marvinelsen/cedict/internal/RegexCedictParserTest.kt b/src/test/kotlin/com/marvinelsen/cedict/internal/RegexCedictParserTest.kt
index a0bf097..2cef361 100644
--- a/src/test/kotlin/com/marvinelsen/cedict/internal/RegexCedictParserTest.kt
+++ b/src/test/kotlin/com/marvinelsen/cedict/internal/RegexCedictParserTest.kt
@@ -1,8 +1,8 @@
 package com.marvinelsen.cedict.internal
 
 import com.marvinelsen.cedict.api.CedictDefinition
-import com.marvinelsen.chinese.transliteration.Syllable
-import com.marvinelsen.chinese.transliteration.Tone
+import com.marvinelsen.chinese.transliteration.api.PinyinSyllable
+import com.marvinelsen.chinese.transliteration.api.Tone
 import io.kotest.core.spec.style.ShouldSpec
 import io.kotest.matchers.shouldBe
 import java.util.zip.GZIPInputStream
@@ -16,8 +16,8 @@ class RegexCedictParserTest : ShouldSpec({
         cedictEntry.traditional shouldBe "皮實"
         cedictEntry.simplified shouldBe "皮实"
         cedictEntry.pinyinSyllables shouldBe listOf(
-            Syllable("pi", Tone.SECOND),
-            Syllable("shi", Tone.FIFTH)
+            PinyinSyllable("pi", Tone.SECOND),
+            PinyinSyllable("shi", Tone.FIFTH)
         )
         cedictEntry.definitions shouldBe listOf(
             CedictDefinition(listOf("(of things) durable")),