From 27bfcd62497b3eb683720bb019804e5abd64a9fe Mon Sep 17 00:00:00 2001 From: astrapi69 Date: Tue, 21 Nov 2023 18:39:04 +0100 Subject: [PATCH] prepare new minor release in version 4.2 --- CHANGELOG.md | 17 +++- README.md | 31 ++++++- gradle.properties | 29 ++++--- gradle/dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../astrapi69/swing/base/BaseDesktopMenu.java | 85 ++++++------------- 6 files changed, 89 insertions(+), 77 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1cede46..2b1527b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,25 @@ ## Change log ---------------------- -Version 4.2-SNAPSHOT +Version 4.2 ------------- +CHANGED: +- update gradle to new version 8.5-rc-3 +- update of gradle-plugin dependency 'io.freefair.gradle:lombok-plugin' to new version 8.4 +- update of gradle-plugin dependency 'com.github.ben-manes.versions.gradle.plugin' to new version 0.50.0 +- update of gradle-plugin dependency 'org.ajoberstar.grgit:grgit-gradle' to new version 5.2.1 +- update of gradle-plugin dependency 'com.diffplug.spotless:spotless-plugin-gradle' to new version 6.22.0 +- update of dependency menu-action version to 3.4 +- update of dependency jobj-core version to 8.1 +- update of dependency silly-math to new major version 2.3 +- update of test dependency file-worker version to 17.1 +- update of test dependency randomizer to new minor version 10.2 +- update of test dependency test-object version to 8.2 +- update of test dependency silly-io version to 3 +- update of test dependency miglayout-swing version to 11.2 +- update of test dependencies junit-jupiter-* version to 5.10.1 Version 4.1 ------------- diff --git a/README.md b/README.md index ae02e51..4aaf80d 100644 --- a/README.md +++ b/README.md @@ -33,19 +33,21 @@ types of applications. ## gradle dependency +Replace the variable ${latestVersion} with the current latest version: [![Maven Central](https://img.shields.io/maven-central/v/io.github.astrapi69/swing-base-components?style=plastic)](https://search.maven.org/artifact/io.github.astrapi69/swing-base-components) + You can first define the version in the ext section and add than the following gradle dependency to your project `build.gradle` if you want to import the core functionality of swing-base-components: define version in file gradle.properties ``` -swingBaseComponentsVersion=4.1 +swingBaseComponentsVersion=${latestVersion} ``` or in build.gradle ext area ``` - swingBaseComponentsVersion = "4.1" + swingBaseComponentsVersion = "${latestVersion}" ``` then add the dependency to the dependencies area @@ -68,7 +70,7 @@ Then you can add the dependency to your dependencies: ... - 4.1 + ${latestVersion} ... ... @@ -84,6 +86,29 @@ Then you can add the dependency to your dependencies: +## 📸 Snapshots + +[![Snapshot](https://img.shields.io/badge/dynamic/xml?url=https://oss.sonatype.org/service/local/repositories/snapshots/content/io/github/astrapi69/swing-base-components/maven-metadata.xml&label=snapshot&color=red&query=.//versioning/latest)](https://oss.sonatype.org/content/repositories/snapshots/io/github/astrapi69/swing-base-components/) + +This section describes how to import snapshot versions into your project. +Add the following code snippet to your gradle file in the repositories section: +``` +repositories { + //... +``` +```groovy + maven { + name "Sonatype Nexus Snapshots" + url "https://oss.sonatype.org/content/repositories/snapshots" + mavenContent { + snapshotsOnly() + } + } +``` +``` +} +``` + # Donations This project is kept as an open source product and relies on contributions to remain being diff --git a/gradle.properties b/gradle.properties index 7e46842..d8850ca 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ ###################### # project properties # ###################### -projectVersion=4.2-SNAPSHOT +projectVersion=4.2 groupPackage=io.github.astrapi69 projectSourceCompatibility=17 projectInceptionYear=2021 @@ -28,35 +28,36 @@ projectRepositoriesPasswordKey=ossrhPassword ########################### # gradle-plugins versions # ########################### -gradlePluginLombokVersion=8.3 -gradlePluginVersionsVersion=0.48.0 +gradlePluginLombokVersion=8.4 +gradlePluginVersionsVersion=0.50.0 licenseGradlePluginVersion=0.16.1 -grgitGradlePluginVersion=5.2.0 -spotlessGradlePluginVersion=6.21.0 +grgitGradlePluginVersion=5.2.1 +spotlessGradlePluginVersion=6.22.0 ######################### # dependencies versions # ######################### lombokVersion=1.18.30 modelDataVersion=3.1 -menuActionVersion=3.3 -jobjCoreVersion=7.1 +menuActionVersion=3.4 +jobjCoreVersion=8.1 sillyCollectionVersion=27 -sillyMathVersion=2.2 +sillyMathVersion=2.3 throwableVersion=2.3 awtExtensionsVersion=1.1 ############################## # test dependencies versions # ############################## assertjSwingVersion=3.17.1 -randomizerVersion=9 +randomizerVersion=10.2 iconImgExtensionsVersion=3.2 -testObjectVersion=7.2 -fileWorkerVersion=17 -sillyIoVersion=2.2 -miglayoutSwingVersion=11.1 +testObjectVersion=8.2 +fileWorkerVersion=17.1 +sillyIoVersion=3 +miglayoutSwingVersion=11.2 meanbeanVersion=3.0.0-M9 junitJupiterExtensionsVersion=1.1 -junitJupiterVersion=5.10.0 +junitJupiterVersion=5.10.1 +junitPlatformLauncherVersion=1.10.1 ########################## # for deploy on sonatype # ########################## diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index d3ad81a..005f61d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -20,5 +20,5 @@ dependencies { testImplementation("com.github.meanbeanlib:meanbean:$meanbeanVersion") testImplementation("io.github.astrapi69:junit-jupiter-extensions:$junitJupiterExtensionsVersion") testImplementation("org.junit.jupiter:junit-jupiter:$junitJupiterVersion") - testRuntimeOnly("org.junit.platform:junit-platform-launcher") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitPlatformLauncherVersion") } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 40a9625..c564064 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ #Wed Feb 19 18:39:09 CET 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-rc-3-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists diff --git a/src/main/java/io/github/astrapi69/swing/base/BaseDesktopMenu.java b/src/main/java/io/github/astrapi69/swing/base/BaseDesktopMenu.java index a4468aa..ee8c39a 100644 --- a/src/main/java/io/github/astrapi69/swing/base/BaseDesktopMenu.java +++ b/src/main/java/io/github/astrapi69/swing/base/BaseDesktopMenu.java @@ -120,9 +120,8 @@ public BaseDesktopMenu(@NonNull Component applicationFrame) */ protected JMenu newEditMenu() { - return MenuItemInfo.builder().menuInfo(MenuInfo.builder().text("Edit") - .mnemonic(MenuExtensions.toMnemonic('E')).name(BaseMenuId.EDIT.propertiesKey()).build()) - .build().toJMenu(); + return MenuItemInfo.builder().text("Edit").mnemonic(MenuExtensions.toMnemonic('E')) + .name(BaseMenuId.EDIT.propertiesKey()).build().toJMenu(); } /** @@ -134,35 +133,25 @@ protected JMenu newFileMenu() { // File - final JMenu fileMenu = MenuItemInfo.builder() - .menuInfo(MenuInfo.builder().text("File").mnemonic(MenuExtensions.toMnemonic('F')) - .name(BaseMenuId.FILE.propertiesKey()).build()) - - .build().toJMenu(); + final JMenu fileMenu = MenuItemInfo.builder().text("File") + .mnemonic(MenuExtensions.toMnemonic('F')).name(BaseMenuId.FILE.propertiesKey()).build() + .toJMenu(); // Fullscreen - JMenuItem toggleFullscreenMenuItem = MenuItemInfo.builder() - - .menuInfo(MenuInfo.builder().text("Toggle Fullscreen") - .mnemonic(MenuExtensions.toMnemonic('T')) - .keyStrokeInfo(KeyStrokeInfo.toKeyStrokeInfo( - KeyStroke.getKeyStroke(KeyEvent.VK_F11, InputEvent.ALT_DOWN_MASK))) - .name(BaseMenuId.TOGGLE_FULLSCREEN.propertiesKey()).build()) - + JMenuItem toggleFullscreenMenuItem = MenuItemInfo.builder().text("Toggle Fullscreen") + .mnemonic(MenuExtensions.toMnemonic('T')) + .keyStrokeInfo(KeyStrokeInfo + .toKeyStrokeInfo(KeyStroke.getKeyStroke(KeyEvent.VK_F11, InputEvent.ALT_DOWN_MASK))) + .name(BaseMenuId.TOGGLE_FULLSCREEN.propertiesKey()) .actionListener(new ToggleFullScreenAction("Fullscreen", (JFrame)getApplicationFrame())) .build().toJMenuItem(); fileMenu.add(toggleFullscreenMenuItem); // Exit - JMenuItem exitMenuItem = MenuItemInfo.builder() - - .menuInfo(MenuInfo.builder().text("Exit").mnemonic(MenuExtensions.toMnemonic('E')) - .name(BaseMenuId.EXIT.propertiesKey()) - .keyStrokeInfo(KeyStrokeInfo - .toKeyStrokeInfo(KeyStrokeExtensions.getKeyStroke("alt pressed F4"))) - .build()) - - + JMenuItem exitMenuItem = MenuItemInfo.builder().text("Exit") + .mnemonic(MenuExtensions.toMnemonic('E')).name(BaseMenuId.EXIT.propertiesKey()) + .keyStrokeInfo( + KeyStrokeInfo.toKeyStrokeInfo(KeyStrokeExtensions.getKeyStroke("alt pressed F4"))) .actionListener(new ExitApplicationAction("Exit")).build().toJMenuItem(); fileMenu.add(exitMenuItem); return fileMenu; @@ -177,42 +166,28 @@ protected JMenu newHelpMenu() { // @formatter:on // Help menu - final JMenu menuHelp = MenuItemInfo.builder() - - .menuInfo( - MenuInfo.builder().text(newLabelTextHelp()).mnemonic(MenuExtensions.toMnemonic('H')) - .name(BaseMenuId.HELP.propertiesKey()).build()) - - .build().toJMenu(); + final JMenu menuHelp = MenuItemInfo.builder().text(newLabelTextHelp()) + .mnemonic(MenuExtensions.toMnemonic('H')).name(BaseMenuId.HELP.propertiesKey()).build() + .toJMenu(); // Donate - final JMenuItem mihDonate = MenuItemInfo.builder() - - .menuInfo(MenuInfo.builder().text(newLabelTextDonate()) - .name(BaseMenuId.HELP_DONATE.propertiesKey()).build()) - + final JMenuItem mihDonate = MenuItemInfo.builder().text(newLabelTextDonate()) + .name(BaseMenuId.HELP_DONATE.propertiesKey()) .actionListener(newOpenBrowserToDonateAction(newLabelTextDonate(), applicationFrame)) .build().toJMenuItem(); menuHelp.add(mihDonate); // Licence - final JMenuItem mihLicence = MenuItemInfo.builder() - - .menuInfo(MenuInfo.builder().text(newLabelTextLicence()) - .name(BaseMenuId.HELP_LICENSE.propertiesKey()).build()) - + final JMenuItem mihLicence = MenuItemInfo.builder().text(newLabelTextLicence()) + .name(BaseMenuId.HELP_LICENSE.propertiesKey()) .actionListener( newShowLicenseFrameAction(newLabelTextLicence() + "Action", newLabelTextLicence())) .build().toJMenuItem(); menuHelp.add(mihLicence); // Info - final JMenuItem mihInfo = MenuItemInfo.builder() - - .menuInfo(MenuInfo.builder().text(newLabelTextInfo()) - .name(BaseMenuId.HELP_INFO.propertiesKey()).mnemonic(MenuExtensions.toMnemonic('i')) - .keyStrokeInfo(KeyStrokeInfo - .toKeyStrokeInfo(KeyStrokeExtensions.getKeyStroke("ctrl pressed I"))) - .build()) - + final JMenuItem mihInfo = MenuItemInfo.builder().text(newLabelTextInfo()) + .name(BaseMenuId.HELP_INFO.propertiesKey()).mnemonic(MenuExtensions.toMnemonic('i')) + .keyStrokeInfo( + KeyStrokeInfo.toKeyStrokeInfo(KeyStrokeExtensions.getKeyStroke("ctrl pressed I"))) .actionListener(newShowInfoDialogAction(newLabelTextInfo(), (Frame)getApplicationFrame(), newLabelTextInfo())) .build().toJMenuItem(); @@ -406,13 +381,9 @@ protected String newLabelTextVersion() protected JMenu newLookAndFeelMenu() { final JMenu menuLookAndFeel = MenuItemInfo.builder() - - .menuInfo(MenuInfo.builder() - .text("Look and Feel") - .mnemonic(MenuExtensions.toMnemonic('L')) - .name(BaseMenuId.LOOK_AND_FEEL.propertiesKey()) - .build()) - + .text("Look and Feel") + .mnemonic(MenuExtensions.toMnemonic('L')) + .name(BaseMenuId.LOOK_AND_FEEL.propertiesKey()) .build().toJMenu(); // Look and Feel JMenuItems