From 995839e12ea13075b7776f8efbd9c2c2bc93828b Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Thu, 9 Feb 2023 18:24:07 +0100 Subject: [PATCH 1/8] Add language component as submodule in composite build --- .gitmodules | 3 +++ marytts-lang-hsb | 1 + settings.gradle | 1 + 3 files changed, 5 insertions(+) create mode 160000 marytts-lang-hsb diff --git a/.gitmodules b/.gitmodules index 1f99281..e9739f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "gradle-flaml-plugin"] path = gradle-flaml-plugin url = https://github.com/m2ci-msp/gradle-flaml-plugin.git +[submodule "marytts-lang-hsb"] + path = marytts-lang-hsb + url = https://github.com/marytts/marytts-lang-hsb.git diff --git a/marytts-lang-hsb b/marytts-lang-hsb new file mode 160000 index 0000000..a4291b1 --- /dev/null +++ b/marytts-lang-hsb @@ -0,0 +1 @@ +Subproject commit a4291b1eaa2cae94566b758d8e3ed37447c52186 diff --git a/settings.gradle b/settings.gradle index f996404..1fb3a43 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,3 @@ rootProject.name = 'serbski-institut-hsb-data' includeBuild 'gradle-flaml-plugin' +includeBuild 'marytts-lang-hsb' From 3364d98c5af3c034d21f7ca6713e3553ea8034d2 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Thu, 9 Feb 2023 18:24:39 +0100 Subject: [PATCH 2/8] Drop local Maven repo --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6abe8ff..4e2dea3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,6 @@ version '0.2.0-SNAPSHOT' description 'Upper Sorbian voice data for MaryTTS' repositories { - mavenLocal() - exclusiveContent { forRepository { ivy { From c794ec29f040a16f21db6a43b7047836a4f1d89c Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Mon, 13 Feb 2023 18:54:06 +0100 Subject: [PATCH 3/8] Upgrade submodule to v0.1.1 --- marytts-lang-hsb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marytts-lang-hsb b/marytts-lang-hsb index a4291b1..83f5d50 160000 --- a/marytts-lang-hsb +++ b/marytts-lang-hsb @@ -1 +1 @@ -Subproject commit a4291b1eaa2cae94566b758d8e3ed37447c52186 +Subproject commit 83f5d509b70b4dd85ff38761ce83a9f6fd4fc048 From 95c6626356579480594bbc88429bbb41e8e7f2b8 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Mon, 13 Feb 2023 18:56:01 +0100 Subject: [PATCH 4/8] Upgrade language component to v0.1.1, drop it from composite build --- build.gradle | 2 +- settings.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 4e2dea3..ffdc9c6 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ configurations { dependencies { data group: 'de.serbski-institut', name: 'hsb_audio_data', version: '20230117', ext: 'zip' - marytts group: 'de.dfki.mary', name: 'marytts-lang-hsb', version: '0.1.0' + marytts group: 'de.dfki.mary', name: 'marytts-lang-hsb', version: '0.1.1' } def unpackDataTask = tasks.register('unpackData') { diff --git a/settings.gradle b/settings.gradle index 1fb3a43..f996404 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ rootProject.name = 'serbski-institut-hsb-data' includeBuild 'gradle-flaml-plugin' -includeBuild 'marytts-lang-hsb' From 9481c42fd849adcfbff13e294ce0427e1850a512 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Mon, 13 Feb 2023 19:00:07 +0100 Subject: [PATCH 5/8] Upgrade FLAML plugin to v0.4.0 --- gradle-flaml-plugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle-flaml-plugin b/gradle-flaml-plugin index e9662c0..4505fd2 160000 --- a/gradle-flaml-plugin +++ b/gradle-flaml-plugin @@ -1 +1 @@ -Subproject commit e9662c086abb211c111377648d64c40d4cf03877 +Subproject commit 4505fd230824d48c562007bbbc090cc99924e4f5 From 5e54a654333b94421f229c8d2e2d5abd4b1df3e0 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Mon, 13 Feb 2023 19:01:22 +0100 Subject: [PATCH 6/8] Upgrade FLAML plugin to v0.4.0, drop it from composite build --- build.gradle | 2 +- settings.gradle | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index ffdc9c6..46565a7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'base' id 'de.dfki.mary.voicebuilding.marytts-kaldi-mfa' version '0.4.0' - id 'org.m2ci.msp.flaml' + id 'org.m2ci.msp.flaml' version '0.4.0' } group 'de.dfki.mary' diff --git a/settings.gradle b/settings.gradle index f996404..3abb7c0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ rootProject.name = 'serbski-institut-hsb-data' -includeBuild 'gradle-flaml-plugin' From b2e5aaecb8668400932ef125bf86950be7e4d1c6 Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Mon, 13 Feb 2023 19:02:37 +0100 Subject: [PATCH 7/8] Drop submodules --- .gitmodules | 6 ------ gradle-flaml-plugin | 1 - marytts-lang-hsb | 1 - 3 files changed, 8 deletions(-) delete mode 100644 .gitmodules delete mode 160000 gradle-flaml-plugin delete mode 160000 marytts-lang-hsb diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index e9739f6..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "gradle-flaml-plugin"] - path = gradle-flaml-plugin - url = https://github.com/m2ci-msp/gradle-flaml-plugin.git -[submodule "marytts-lang-hsb"] - path = marytts-lang-hsb - url = https://github.com/marytts/marytts-lang-hsb.git diff --git a/gradle-flaml-plugin b/gradle-flaml-plugin deleted file mode 160000 index 4505fd2..0000000 --- a/gradle-flaml-plugin +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4505fd230824d48c562007bbbc090cc99924e4f5 diff --git a/marytts-lang-hsb b/marytts-lang-hsb deleted file mode 160000 index 83f5d50..0000000 --- a/marytts-lang-hsb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 83f5d509b70b4dd85ff38761ce83a9f6fd4fc048 From a1d409cdfa251dd05a29176429448fe9dd86d13f Mon Sep 17 00:00:00 2001 From: Ingmar Steiner Date: Tue, 14 Feb 2023 18:37:21 +0100 Subject: [PATCH 8/8] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 088690d..2425264 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Changelog [Unreleased] ------------ +### Changed + +- Upgraded marytts-lang-hsb to v0.1.1 + [v0.1.0] (2023-01-22) ---------------------