Skip to content

Commit

Permalink
prepare new minor release in version 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
astrapi69 committed Nov 21, 2023
1 parent 8f2c246 commit 27bfcd6
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 77 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
-------------
Expand Down
31 changes: 28 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -68,7 +70,7 @@ Then you can add the dependency to your dependencies:
<properties>
...
<!-- swing-base-components version -->
<swing-base-components.version>4.1</swing-base-components.version>
<swing-base-components.version>${latestVersion}</swing-base-components.version>
...
</properties>
...
Expand All @@ -84,6 +86,29 @@ Then you can add the dependency to your dependencies:
</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
Expand Down
29 changes: 15 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
######################
# project properties #
######################
projectVersion=4.2-SNAPSHOT
projectVersion=4.2
groupPackage=io.github.astrapi69
projectSourceCompatibility=17
projectInceptionYear=2021
Expand All @@ -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 #
##########################
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
85 changes: 28 additions & 57 deletions src/main/java/io/github/astrapi69/swing/base/BaseDesktopMenu.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

/**
Expand All @@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 27bfcd6

Please sign in to comment.