From 9f1829c5f74550b2bcefef0fb58417cebc1e7dab Mon Sep 17 00:00:00 2001 From: bobbylight Date: Sun, 6 Aug 2023 17:38:47 -0400 Subject: [PATCH] Preparing for 6.0.2 release --- MakeRTextInstaller.nsi | 5 +++-- gradle.properties | 12 ++++++------ launch4j.xml | 2 +- mac/build-mac-app.sh | 2 +- src/main/dist/License.txt | 2 +- src/main/dist/doc/en/Introduction.html | 2 +- src/main/dist/doc/en/License.txt | 2 +- src/main/java/org/fife/rtext/RText.java | 2 +- .../java/org/fife/rtext/plugins/console/Plugin.java | 2 +- .../plugins/filesystemtree/FileSystemTreePlugin.java | 2 +- .../plugins/heapindicator/HeapIndicatorPlugin.java | 2 +- .../org/fife/rtext/plugins/langsupport/Plugin.java | 2 +- .../org/fife/rtext/plugins/macros/MacroPlugin.java | 2 +- .../fife/rtext/plugins/project/ProjectPlugin.java | 2 +- .../plugins/sourcebrowser/SourceBrowserPlugin.java | 2 +- .../org/fife/rtext/plugins/tasks/TasksPlugin.java | 2 +- .../java/org/fife/rtext/plugins/tidy/Plugin.java | 2 +- .../org/fife/rtext/plugins/tools/ToolPlugin.java | 2 +- 18 files changed, 25 insertions(+), 24 deletions(-) diff --git a/MakeRTextInstaller.nsi b/MakeRTextInstaller.nsi index 82d40955..a8f3a91c 100644 --- a/MakeRTextInstaller.nsi +++ b/MakeRTextInstaller.nsi @@ -2,7 +2,7 @@ ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "RText" -!define PRODUCT_VERSION "6.0.1" +!define PRODUCT_VERSION "6.0.2" !define PRODUCT_WEB_SITE "https://bobbylight.github.io/RText/" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RText.exe" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" @@ -96,7 +96,8 @@ Section Uninstall RMDir /r "$INSTDIR\jre-14.0.1" ; From prior installs RMDir /r "$INSTDIR\jre-17.0.2" ; From prior installs RMDir /r "$INSTDIR\jre-17.0.5" ; From prior installs - RMDir /r "$INSTDIR\jre-17.0.6" + RMDir /r "$INSTDIR\jre-17.0.6" ; From prior installs + RMDir /r "$INSTDIR\jre-17.0.8" RMDir /r "$INSTDIR\lnfs" ; From prior installs RMDir /r "$INSTDIR\plugins" Delete /REBOOTOK "$INSTDIR\RText.*" diff --git a/gradle.properties b/gradle.properties index 2b7151db..c34fea4a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,14 +1,14 @@ # Note that Maven- and signing-related properties are in /gradle.properties javaVersion=17 -version=6.0.2-SNAPSHOT +version=6.0.2 # The JDK to use when generating the embedded JRE -jdkRoot=C:/java/jdk-17.0.6 -#export JAVA_HOME=/c/java/jdk-17.0.6 -#jdkRoot=/Library/Java/JavaVirtualMachines/jdk-17.0.6.jdk/Contents/Home -#export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-17.0.6.jdk/Contents/Home +jdkRoot=C:/java/jdk-17.0.8 +#export JAVA_HOME=/c/java/jdk-17.0.8 +#jdkRoot=/Library/Java/JavaVirtualMachines/jdk-17.0.8.jdk/Contents/Home +#export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-17.0.8.jdk/Contents/Home # The folder to store the embedded JRE in (Windows only) -embeddedJreFolderName=jre-17.0.6 +embeddedJreFolderName=jre-17.0.8 launch4jExe=C:/Progra~2/Launch4j/launch4jc.exe diff --git a/launch4j.xml b/launch4j.xml index aafb0f00..501e8c0e 100644 --- a/launch4j.xml +++ b/launch4j.xml @@ -15,7 +15,7 @@ rtext.ico - jre-17.0.6 + jre-17.0.8 true false diff --git a/mac/build-mac-app.sh b/mac/build-mac-app.sh index 745c8044..89e691af 100755 --- a/mac/build-mac-app.sh +++ b/mac/build-mac-app.sh @@ -8,7 +8,7 @@ # The version of RText you're building. This appears in the generated # .dmg file name. -APP_VERSION=6.0.1 +APP_VERSION=6.0.2 # # You probably don't want to change anything below this line. diff --git a/src/main/dist/License.txt b/src/main/dist/License.txt index 8768055d..b30a485a 100644 --- a/src/main/dist/License.txt +++ b/src/main/dist/License.txt @@ -1,4 +1,4 @@ -Copyright (c) 2022, Robert Futrell +Copyright (c) 2023, Robert Futrell All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/main/dist/doc/en/Introduction.html b/src/main/dist/doc/en/Introduction.html index 43c47e4b..ba430de0 100644 --- a/src/main/dist/doc/en/Introduction.html +++ b/src/main/dist/doc/en/Introduction.html @@ -29,7 +29,7 @@

Introduction

Bug List first, as they'll most likely answer any questions you may have.

-

RText is released under the GNU General Public License.

+

RText is released under a modified BSD license.

diff --git a/src/main/dist/doc/en/License.txt b/src/main/dist/doc/en/License.txt index 4d5910e2..b30a485a 100644 --- a/src/main/dist/doc/en/License.txt +++ b/src/main/dist/doc/en/License.txt @@ -1,4 +1,4 @@ -Copyright (c) 2012, Robert Futrell +Copyright (c) 2023, Robert Futrell All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/src/main/java/org/fife/rtext/RText.java b/src/main/java/org/fife/rtext/RText.java index f5da7aa4..1fda6a00 100644 --- a/src/main/java/org/fife/rtext/RText.java +++ b/src/main/java/org/fife/rtext/RText.java @@ -169,7 +169,7 @@ public class RText extends AbstractPluggableGUIApplication */ private static final String PROPERTY_PRINT_START_TIMES = "printStartTimes"; - public static final String VERSION_STRING = "6.0.1"; + public static final String VERSION_STRING = "6.0.2"; /** diff --git a/src/main/java/org/fife/rtext/plugins/console/Plugin.java b/src/main/java/org/fife/rtext/plugins/console/Plugin.java index 88fe1f71..3ead0f3e 100644 --- a/src/main/java/org/fife/rtext/plugins/console/Plugin.java +++ b/src/main/java/org/fife/rtext/plugins/console/Plugin.java @@ -40,7 +40,7 @@ */ public class Plugin extends GUIPlugin { - private static final String VERSION = "6.0.1"; + private static final String VERSION = "6.0.2"; private static final String DOCKABLE_WINDOW_CONSOLE = "consoleDockableWindow"; private ConsoleWindow window; diff --git a/src/main/java/org/fife/rtext/plugins/filesystemtree/FileSystemTreePlugin.java b/src/main/java/org/fife/rtext/plugins/filesystemtree/FileSystemTreePlugin.java index c53b93c1..97fc19e7 100644 --- a/src/main/java/org/fife/rtext/plugins/filesystemtree/FileSystemTreePlugin.java +++ b/src/main/java/org/fife/rtext/plugins/filesystemtree/FileSystemTreePlugin.java @@ -54,7 +54,7 @@ public class FileSystemTreePlugin extends GUIPlugin { static final String BUNDLE_NAME = "org/fife/rtext/plugins/filesystemtree/FileSystemTree"; - private static final String VERSION_STRING = "6.0.1"; + private static final String VERSION_STRING = "6.0.2"; public static final String SELECT_CURRENT_FILE_ACTION_NAME = "FileSystemTree.SelectCurrentFileAction"; diff --git a/src/main/java/org/fife/rtext/plugins/heapindicator/HeapIndicatorPlugin.java b/src/main/java/org/fife/rtext/plugins/heapindicator/HeapIndicatorPlugin.java index b4a3b9fe..5741d04b 100644 --- a/src/main/java/org/fife/rtext/plugins/heapindicator/HeapIndicatorPlugin.java +++ b/src/main/java/org/fife/rtext/plugins/heapindicator/HeapIndicatorPlugin.java @@ -57,7 +57,7 @@ public class HeapIndicatorPlugin extends StatusBarPlugin { private static final String BUNDLE_NAME = "org.fife.rtext.plugins.heapindicator.HeapIndicator"; - private static final String VERSION = "6.0.1"; + private static final String VERSION = "6.0.2"; /** diff --git a/src/main/java/org/fife/rtext/plugins/langsupport/Plugin.java b/src/main/java/org/fife/rtext/plugins/langsupport/Plugin.java index 97b884b2..1d55fcc6 100644 --- a/src/main/java/org/fife/rtext/plugins/langsupport/Plugin.java +++ b/src/main/java/org/fife/rtext/plugins/langsupport/Plugin.java @@ -72,7 +72,7 @@ public class Plugin extends GUIPlugin { private Map icons; private TypeScriptSupport typeScriptSupport; - private static final String PLUGIN_VERSION = "6.0.1"; + private static final String PLUGIN_VERSION = "6.0.2"; private static final String PREFS_FILE_NAME = "langSupport.properties"; private static final String MSG_BUNDLE = "org.fife.rtext.plugins.langsupport.Plugin"; diff --git a/src/main/java/org/fife/rtext/plugins/macros/MacroPlugin.java b/src/main/java/org/fife/rtext/plugins/macros/MacroPlugin.java index 86c8c0d2..68911f62 100644 --- a/src/main/java/org/fife/rtext/plugins/macros/MacroPlugin.java +++ b/src/main/java/org/fife/rtext/plugins/macros/MacroPlugin.java @@ -42,7 +42,7 @@ public class MacroPlugin extends AbstractPlugin implements PropertyChangeListener { - private static final String VERSION = "6.0.1"; + private static final String VERSION = "6.0.2"; private MacroOptionPanel optionPanel; private JMenu macrosMenu; diff --git a/src/main/java/org/fife/rtext/plugins/project/ProjectPlugin.java b/src/main/java/org/fife/rtext/plugins/project/ProjectPlugin.java index 039a94a8..f0d9c6a2 100644 --- a/src/main/java/org/fife/rtext/plugins/project/ProjectPlugin.java +++ b/src/main/java/org/fife/rtext/plugins/project/ProjectPlugin.java @@ -63,7 +63,7 @@ public class ProjectPlugin extends GUIPlugin { private static final String VIEW_CONSOLE_ACTION = "viewProjectWindowAction"; private static final String DOCKABLE_WINDOW_PROJECTS = "projectsDockableWindow"; - private static final String VERSION_STRING = "6.0.1"; + private static final String VERSION_STRING = "6.0.2"; public ProjectPlugin(RText app) { diff --git a/src/main/java/org/fife/rtext/plugins/sourcebrowser/SourceBrowserPlugin.java b/src/main/java/org/fife/rtext/plugins/sourcebrowser/SourceBrowserPlugin.java index 90ec4808..5a4da28a 100644 --- a/src/main/java/org/fife/rtext/plugins/sourcebrowser/SourceBrowserPlugin.java +++ b/src/main/java/org/fife/rtext/plugins/sourcebrowser/SourceBrowserPlugin.java @@ -86,7 +86,7 @@ public class SourceBrowserPlugin extends GUIPlugin static final String BUNDLE_NAME = "org.fife.rtext.plugins.sourcebrowser.SourceBrowser"; - private static final String VERSION_STRING = "6.0.1"; + private static final String VERSION_STRING = "6.0.2"; private static final String VIEW_SB_ACTION = "ViewSourceBrowserAction"; diff --git a/src/main/java/org/fife/rtext/plugins/tasks/TasksPlugin.java b/src/main/java/org/fife/rtext/plugins/tasks/TasksPlugin.java index 989579ef..268fdc6a 100644 --- a/src/main/java/org/fife/rtext/plugins/tasks/TasksPlugin.java +++ b/src/main/java/org/fife/rtext/plugins/tasks/TasksPlugin.java @@ -67,7 +67,7 @@ public class TasksPlugin extends GUIPlugin { private static final String MSG_BUNDLE = "org.fife.rtext.plugins.tasks.TasksPlugin"; private static final ResourceBundle MSG = ResourceBundle.getBundle(MSG_BUNDLE); - private static final String VERSION = "6.0.1"; + private static final String VERSION = "6.0.2"; private static final String VIEW_TASKS_ACTION = "viewTasksAction"; private static final String DOCKABLE_WINDOW_TASKS = "tasksDockableWindow"; diff --git a/src/main/java/org/fife/rtext/plugins/tidy/Plugin.java b/src/main/java/org/fife/rtext/plugins/tidy/Plugin.java index 790a2ed8..28ce71d1 100644 --- a/src/main/java/org/fife/rtext/plugins/tidy/Plugin.java +++ b/src/main/java/org/fife/rtext/plugins/tidy/Plugin.java @@ -59,7 +59,7 @@ public class Plugin extends AbstractPlugin private XmlOptions xmlOptions; private JsonOptions jsonOptions; - private static final String PLUGIN_VERSION = "6.0.1"; + private static final String PLUGIN_VERSION = "6.0.2"; private static final String TIDY_ACTION = "PrettyPrintAction"; diff --git a/src/main/java/org/fife/rtext/plugins/tools/ToolPlugin.java b/src/main/java/org/fife/rtext/plugins/tools/ToolPlugin.java index b823ef55..730138ef 100644 --- a/src/main/java/org/fife/rtext/plugins/tools/ToolPlugin.java +++ b/src/main/java/org/fife/rtext/plugins/tools/ToolPlugin.java @@ -46,7 +46,7 @@ */ public class ToolPlugin extends GUIPlugin implements PropertyChangeListener { - private static final String VERSION = "6.0.1"; + private static final String VERSION = "6.0.2"; private ToolOptionPanel optionPanel; private Map icons;