Skip to content

Commit

Permalink
Preparing for 6.0.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
bobbylight committed Aug 6, 2023
1 parent bbe12f1 commit 9f1829c
Show file tree
Hide file tree
Showing 18 changed files with 25 additions and 24 deletions.
5 changes: 3 additions & 2 deletions MakeRTextInstaller.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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.*"
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Note that Maven- and signing-related properties are in <maven-home>/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
2 changes: 1 addition & 1 deletion launch4j.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<manifest></manifest>
<icon>rtext.ico</icon>
<jre>
<path>jre-17.0.6</path>
<path>jre-17.0.8</path>
<bundledJre64Bit>true</bundledJre64Bit>
<bundledJreAsFallback>false</bundledJreAsFallback>
<minVersion></minVersion>
Expand Down
2 changes: 1 addition & 1 deletion mac/build-mac-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/main/dist/License.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/dist/doc/en/Introduction.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h2>Introduction</h2>
<a href="BugList.html">Bug List</a> first, as they'll most
likely answer any questions you may have.</p>

<p>RText is released under the <a href="License.txt">GNU General Public License</a>.</p>
<p>RText is released under a <a href="License.txt">modified BSD license</a>.</p>

</body>

Expand Down
2 changes: 1 addition & 1 deletion src/main/dist/doc/en/License.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/fife/rtext/RText.java
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public class RText extends AbstractPluggableGUIApplication<RTextPrefs>
*/
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";


/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/fife/rtext/plugins/console/Plugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
*/
public class Plugin extends GUIPlugin<RText> {

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public class FileSystemTreePlugin extends GUIPlugin<RText> {

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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public class HeapIndicatorPlugin extends StatusBarPlugin<RText> {

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";


/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class Plugin extends GUIPlugin<RText> {
private Map<ParserNotice.Level, Icon> 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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
public class MacroPlugin extends AbstractPlugin<RText>
implements PropertyChangeListener {

private static final String VERSION = "6.0.1";
private static final String VERSION = "6.0.2";

private MacroOptionPanel optionPanel;
private JMenu macrosMenu;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public class ProjectPlugin extends GUIPlugin<RText> {

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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public class SourceBrowserPlugin extends GUIPlugin<RText>
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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public class TasksPlugin extends GUIPlugin<RText> {
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";

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/fife/rtext/plugins/tidy/Plugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class Plugin extends AbstractPlugin<RText>
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";

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/fife/rtext/plugins/tools/ToolPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
*/
public class ToolPlugin extends GUIPlugin<RText> implements PropertyChangeListener {

private static final String VERSION = "6.0.1";
private static final String VERSION = "6.0.2";

private ToolOptionPanel optionPanel;
private Map<String, Icon> icons;
Expand Down

0 comments on commit 9f1829c

Please sign in to comment.