Browse Source

:bug: Properly fix Maven POM for #168 and #170

Signed-off-by: palexdev <alessandro.parisi406@gmail.com>
palexdev 3 years ago
parent
commit
def0636cef

+ 1 - 1
build.gradle

@@ -14,7 +14,7 @@ subprojects {
     apply plugin: 'org.openjfx.javafxplugin'
 
     javafx {
-        version = "17.0.2"
+        version = '18'
         modules = ['javafx.controls', 'javafx.fxml', 'javafx.media', 'javafx.swing', 'javafx.web']
     }
 }

+ 4 - 2
demo/build.gradle

@@ -20,11 +20,11 @@ dependencies {
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.1'
 
     implementation name: 'scenicview'
-    implementation "fr.brouillard.oss:cssfx:11.4.0"
+    implementation("fr.brouillard.oss:cssfx:11.4.0") { exclude group: 'org.openjfx' }
     implementation 'org.kordamp.ikonli:ikonli-core:12.2.0'
     implementation 'org.kordamp.ikonli:ikonli-javafx:12.2.0'
     implementation 'org.kordamp.ikonli:ikonli-fontawesome5-pack:12.2.0'
-    implementation 'io.github.palexdev:virtualizedfx:11.2.5'
+    implementation 'io.github.palexdev:virtualizedfx:11.2.6'
     implementation project(':materialfx')
 }
 
@@ -62,6 +62,8 @@ jlink {
         jdkHome = jdkDownload("https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-macosx_x64.tar.gz")
         addExtraModulePath("/home/palexdev/Documents/JavaFX_jmods/mac_x64")
     }
+
+    addExtraDependencies('javafx')
 }
 
 

+ 8 - 9
materialfx/build.gradle

@@ -21,9 +21,12 @@ compileJava {
 
 dependencies {
     testImplementation('junit:junit:4.13.2')
-    implementation 'com.vanniktech:gradle-maven-publish-plugin:0.19.0'
 
-    implementation 'io.github.palexdev:virtualizedfx:11.2.5'
+    implementation 'io.github.palexdev:virtualizedfx:11.2.6'
+}
+
+javafx {
+    configuration = 'compileOnly'
 }
 
 javadoc {
@@ -70,7 +73,7 @@ jar {
 shadowJar {
     mergeServiceFiles()
     dependencies {
-        include(dependency('io.github.palexdev:virtualizedfx:11.2.5'))
+        include(dependency('io.github.palexdev:virtualizedfx:11.2.6'))
     }
 }
 
@@ -95,10 +98,6 @@ build {
     dependsOn shadowJar, copyJar, removeBnd
 }
 
-allprojects {
-    plugins.withId("com.vanniktech.maven.publish") {
-        mavenPublish {
-            sonatypeHost = "S01"
-        }
-    }
+mavenPublish {
+    sonatypeHost = "S01"
 }

+ 3 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/i18n/Language.java

@@ -32,7 +32,9 @@ public enum Language {
 	ENGLISH(Locale.ENGLISH),
 	FRENCH(Locale.FRENCH),
 	ITALIANO(Locale.ITALIAN),
-	RUSSIAN(Locale.forLanguageTag("ru"));
+	RUSSIAN(Locale.forLanguageTag("ru")),
+	SIMPLIFIED_CHINESE(Locale.SIMPLIFIED_CHINESE),
+	TRADITIONAL_CHINESE(Locale.TRADITIONAL_CHINESE);
 
 	private final Locale locale;
 

+ 106 - 0
materialfx/src/main/resources/io/github/palexdev/materialfx/i18n/mfxlang_zh_CN.properties

@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2022 Parisi Alessandro
+# This file is part of MaterialFX (https://github.com/palexdev/MaterialFX).
+#
+# MaterialFX is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# MaterialFX is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with MaterialFX.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+##################################################
+# Controls
+##################################################
+
+# Combo Box
+comboBox.contextMenu.selectFirst=选择首个
+comboBox.contextMenu.selectNext=选择下个
+comboBox.contextMenu.selectPrevious=选择上个
+comboBox.contextMenu.selectLast=选择最后
+comboBox.contextMenu.clearSelection=清空选择
+
+# Filter Combo Box
+filterCombo.search=搜索……
+
+# Filter Pane
+filterPane.headerText=过滤器
+filterPane.activeFilters=激活的过滤器
+filterPane.searchField=输入你的过滤器值……
+filterPane.addFilter=添加过滤器
+
+# Notification Center
+notificationCenter.contextMenu.selectAll=全选
+notificationCenter.contextMenu.selectRead=选择已读
+notificationCenter.contextMenu.selectUnread=选择未读
+notificationCenter.contextMenu.clearSelection=清空选择
+notificationCenter.contextMenu.sortState=按状态排序
+notificationCenter.contextMenu.sortTime=按时间排序
+notificationCenter.contextMenu.reverseSort=逆序
+notificationCenter.contextMenu.filterRead=筛选已读
+notificationCenter.contextMenu.filterUnread=筛选未读
+notificationCenter.contextMenu.clearFilter=清除筛选器
+notificationCenter.contextMenu.clearSort=清除排序器
+notificationCenter.contextMenu.selectionSeparator=选择
+notificationCenter.contextMenu.sortingSeparator=排序
+notificationCenter.contextMenu.filterSeparator=过滤
+notificationCenter.dnd=请勿打扰
+notificationCenter.header=通知
+
+# Stepper
+stepper.next=下一步
+stepper.previous=上一步
+
+# Stepper Toggle
+stepperToggle.invalidFields=无效字段……
+
+# Text Fields
+textField.contextMenu.copy=复制
+textField.contextMenu.cut=剪切
+textField.contextMenu.paste=粘贴
+textField.contextMenu.delete=删除
+textField.contextMenu.selectAll=全选
+textField.contextMenu.redo=重做
+textField.contextMenu.undo=撤销
+
+##################################################
+# Enums
+##################################################
+chainMode.alternativeAnd=且
+chainMode.or=或
+
+##################################################
+# Filters
+##################################################
+filter.is=是
+filter.isNot=不是
+filter.greater=大于
+filter.greaterEqual=大于等于
+filter.lesser=小于
+filter.lesserEqual=小于等于
+filter.contains=包含
+filter.containsIgnCase=包含 (忽略大小写)
+filter.containsAny=包含任意
+filter.containsAll=包含全部
+filter.endsWith=以……结尾
+filter.endsWithIgnCase=以……结尾 (忽略大小写)
+filter.equals=等于
+filter.equalsIgnCase=等于 (忽略大小写)
+filter.notEqual=不等于
+filter.startsWith=以……开头
+filter.startsWithIgnCase=以……开头 (忽略大小写)
+
+##################################################
+# Utils
+##################################################
+stringUtil.now=刚刚
+stringUtil.minutes={0} 分钟之前
+stringUtils.hours={0} 小时之前
+stringUtils.days={0} 天之前

+ 106 - 0
materialfx/src/main/resources/io/github/palexdev/materialfx/i18n/mfxlang_zh_TW.properties

@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2022 Parisi Alessandro
+# This file is part of MaterialFX (https://github.com/palexdev/MaterialFX).
+#
+# MaterialFX is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# MaterialFX is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with MaterialFX.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+##################################################
+# Controls
+##################################################
+
+# Combo Box
+comboBox.contextMenu.selectFirst=選擇首個
+comboBox.contextMenu.selectNext=選擇下個
+comboBox.contextMenu.selectPrevious=選擇上個
+comboBox.contextMenu.selectLast=選擇最後
+comboBox.contextMenu.clearSelection=清空選擇
+
+# Filter Combo Box
+filterCombo.search=蒐索……
+
+# Filter Pane
+filterPane.headerText=篩檢程式
+filterPane.activeFilters=活動的篩檢程式
+filterPane.searchField=輸入你的篩檢程式值……
+filterPane.addFilter=添加篩檢程式
+
+# Notification Center
+notificationCenter.contextMenu.selectAll=全選
+notificationCenter.contextMenu.selectRead=選擇已讀
+notificationCenter.contextMenu.selectUnread=選擇未讀
+notificationCenter.contextMenu.clearSelection=清空選擇
+notificationCenter.contextMenu.sortState=按狀態排序
+notificationCenter.contextMenu.sortTime=按時間排序
+notificationCenter.contextMenu.reverseSort=逆序
+notificationCenter.contextMenu.filterRead=篩選已讀
+notificationCenter.contextMenu.filterUnread=篩選未讀
+notificationCenter.contextMenu.clearFilter=清除篩選器
+notificationCenter.contextMenu.clearSort=清除排序器
+notificationCenter.contextMenu.selectionSeparator=選擇
+notificationCenter.contextMenu.sortingSeparator=排序
+notificationCenter.contextMenu.filterSeparator=過濾
+notificationCenter.dnd=請勿打擾
+notificationCenter.header=通知
+
+# Stepper
+stepper.next=下一步
+stepper.previous=上一步
+
+# Stepper Toggle
+stepperToggle.invalidFields=無效欄位……
+
+# Text Fields
+textField.contextMenu.copy=複製
+textField.contextMenu.cut=剪切
+textField.contextMenu.paste=粘貼
+textField.contextMenu.delete=删除
+textField.contextMenu.selectAll=全選
+textField.contextMenu.redo=重做
+textField.contextMenu.undo=撤銷
+
+##################################################
+# Enums
+##################################################
+chainMode.alternativeAnd=且
+chainMode.or=或
+
+##################################################
+# Filters
+##################################################
+filter.is=是
+filter.isNot=不是
+filter.greater=大於
+filter.greaterEqual=大於等於
+filter.lesser=小於
+filter.lesserEqual=小於等於
+filter.contains=包含
+filter.containsIgnCase=包含 (忽略大小寫)
+filter.containsAny=包含任意
+filter.containsAll=包含全部
+filter.endsWith=以……結尾
+filter.endsWithIgnCase=以……結尾 (忽略大小寫)
+filter.equals=等於
+filter.equalsIgnCase=等於 (忽略大小寫)
+filter.notEqual=不等於
+filter.startsWith=以……開頭
+filter.startsWithIgnCase=以……開頭 (忽略大小寫)
+
+##################################################
+# Utils
+##################################################
+stringUtil.now=剛剛
+stringUtil.minutes={0} 分鐘之前
+stringUtils.hours={0} 小時之前
+stringUtils.days={0} 天之前