From 32218864211b1cfc3d3df2eda451c0d3ee74ef95 Mon Sep 17 00:00:00 2001 From: Dmitry Barashev Date: Thu, 5 Dec 2024 21:34:06 +0400 Subject: [PATCH] Upgrade kotlin plugin to 2.1.0 --- build.gradle | 4 ++-- .../src/main/java/biz/ganttproject/impex/csv/Spreadsheet.kt | 2 +- .../src/main/java/biz/ganttproject/lib/fx/Components.kt | 2 +- .../main/java/biz/ganttproject/storage/BrowserPaneBuilder.kt | 4 ++-- .../java/biz/ganttproject/storage/cloud/GPCloudStatusBar.kt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index ef1e94d4b6..8f6069369b 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ import java.nio.file.Files import java.nio.file.Paths plugins { - id "org.jetbrains.kotlin.jvm" version "2.0.21" apply false + id "org.jetbrains.kotlin.jvm" version "2.1.0" apply false } ext.distBinDir = file('ganttproject-builder/dist-bin') ext.pluginsDir = file("ganttproject-builder/dist-bin/plugins/base") @@ -64,7 +64,7 @@ allprojects { subprojects { group 'biz.ganttproject' - version = "3.3.3312" + version = new Date().format("yy.MM.dd") + "-SNAPSHOT" } diff --git a/ganttproject/src/main/java/biz/ganttproject/impex/csv/Spreadsheet.kt b/ganttproject/src/main/java/biz/ganttproject/impex/csv/Spreadsheet.kt index 875418be5a..e5a4d6dc97 100644 --- a/ganttproject/src/main/java/biz/ganttproject/impex/csv/Spreadsheet.kt +++ b/ganttproject/src/main/java/biz/ganttproject/impex/csv/Spreadsheet.kt @@ -101,7 +101,7 @@ enum class SpreadsheetFormat(val extension: String) { CSV("csv"), XLS("xls"); override fun toString(): String { - return "impex.csv.fileformat." + name.toLowerCase() + return "impex.csv.fileformat." + name.lowercase() } companion object { diff --git a/ganttproject/src/main/java/biz/ganttproject/lib/fx/Components.kt b/ganttproject/src/main/java/biz/ganttproject/lib/fx/Components.kt index 0e83e26598..ffedcc7ee7 100644 --- a/ganttproject/src/main/java/biz/ganttproject/lib/fx/Components.kt +++ b/ganttproject/src/main/java/biz/ganttproject/lib/fx/Components.kt @@ -60,7 +60,7 @@ fun buildFontAwesomeButton(iconName: String, label: String? = null, onClick: ((E val contentDisplay = if (label == null) ContentDisplay.GRAPHIC_ONLY else ContentDisplay.LEFT val size = if (label == null) "100%" else "1em" val result = FontAwesomeIconFactory.get().createIconButton( - FontAwesomeIcon.valueOf(iconName.toUpperCase()), label ?: "", size, size, contentDisplay) + FontAwesomeIcon.valueOf(iconName.uppercase()), label ?: "", size, size, contentDisplay) if (onClick != null) { result.addEventHandler(ActionEvent.ACTION, onClick) } diff --git a/ganttproject/src/main/java/biz/ganttproject/storage/BrowserPaneBuilder.kt b/ganttproject/src/main/java/biz/ganttproject/storage/BrowserPaneBuilder.kt index ce7c80a3e2..2016b4ea47 100644 --- a/ganttproject/src/main/java/biz/ganttproject/storage/BrowserPaneBuilder.kt +++ b/ganttproject/src/main/java/biz/ganttproject/storage/BrowserPaneBuilder.kt @@ -201,7 +201,7 @@ class BrowserPaneBuilder( fun withActionButton(btnSetup: (Button) -> Unit) { this.btnSave = Button().also { - it.textProperty().bind(i18n.create("${this.mode.name.toLowerCase()}.actionLabel")) + it.textProperty().bind(i18n.create("${this.mode.name.lowercase()}.actionLabel")) } btnSave.styleClass.add("btn-attention") @@ -287,7 +287,7 @@ class BrowserPaneBuilder( installEventHandlers() rootPane.apply { vbox.prefWidth = 400.0 - addTitle(this@BrowserPaneBuilder.i18n.create("${this@BrowserPaneBuilder.mode.name.toLowerCase()}.title")).also { + addTitle(this@BrowserPaneBuilder.i18n.create("${this@BrowserPaneBuilder.mode.name.lowercase()}.title")).also { it.styleClass.add("title-integrated") } add(vbox { diff --git a/ganttproject/src/main/java/biz/ganttproject/storage/cloud/GPCloudStatusBar.kt b/ganttproject/src/main/java/biz/ganttproject/storage/cloud/GPCloudStatusBar.kt index a7b3be8730..b702ab0e13 100644 --- a/ganttproject/src/main/java/biz/ganttproject/storage/cloud/GPCloudStatusBar.kt +++ b/ganttproject/src/main/java/biz/ganttproject/storage/cloud/GPCloudStatusBar.kt @@ -88,7 +88,7 @@ class GPCloudStatusBar( field = value Platform.runLater { toggleConnect.isSelected = value - labelConnect.text = STATUS_BAR_LOCALIZER.formatText("connected.${value.toString().toLowerCase()}") + labelConnect.text = STATUS_BAR_LOCALIZER.formatText("connected.${value.toString().lowercase()}") GPCloudOptions.cloudStatus.value = if (value) CloudStatus.CONNECTED else CloudStatus.DISCONNECTED } }