Merge branch 'develop'

NinjaTerm.install4j

@@ -63,7 +63,7 @@
       </iconImageFiles>
     </launcher>
   </launchers>
-  <installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://raw.githubusercontent.com/mbedded-ninja/NinjaTerm/master/updates.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://github.com/mbedded-ninja/NinjaTerm/releases/download/v${compiler:sys.version}/">
+  <installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://raw.githubusercontent.com/gbmhunter/NinjaTerm/master/updates.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://github.com/gbmhunter/NinjaTerm/releases/download/v${compiler:sys.version}/">
     <staticMembers script="" />
     <customCode />
     <autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
@@ -1229,7 +1229,7 @@ return true;</string>
     </applications>
   </installerGui>
   <mediaSets>
-    <windows name="Windows" id="23" customizedId="" mediaFileName="" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
+    <windows name="Windows" id="23" customizedId="" mediaFileName="" installDir="${compiler:sys.shortName}" overridePrincipalLanguage="false" jreBitType="32" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="windows-x86-1.8.0_202" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" customInstallBaseDir="" contentFilesType="1" verifyIntegrity="true">
       <excludedComponents />
       <includedDownloadableComponents />
       <excludedLaunchers />
@@ -1242,7 +1242,7 @@ return true;</string>
         <customAttributes />
       </autoUpdate>
     </windows>
-    <macos name="Mac OS X Single Bundle" id="36" customizedId="" mediaFileName="" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" appleJre="false" requiredVmIdPrefix="" customInstallBaseDir="" contentFilesType="1" installerName="${i18n:InstallerName(${compiler:sys.fullName})}" volumeName="${compiler:sys.shortName}" compressDmg="false" launcherId="22">
+    <macos name="Mac OS X Single Bundle" id="36" customizedId="" mediaFileName="" installDir="${compiler:sys.fullName}" overridePrincipalLanguage="false" jreBitType="all" runPostProcessor="false" postProcessor="" failOnPostProcessorError="false" useLegacyMediaFileIds="false" legacyMediaFileIds="" downloadURL="" includeAllDownloadableComponents="false" includedJRE="macosx-amd64-1.8.0_202" manualJREEntry="false" bundleType="1" jreURL="" jreShared="false" directDownload="false" installOnlyIfNecessary="false" appleJre="false" requiredVmIdPrefix="" customInstallBaseDir="" contentFilesType="1" installerName="${i18n:InstallerName(${compiler:sys.fullName})}" volumeName="${compiler:sys.shortName}" compressDmg="false" launcherId="22">
       <excludedComponents />
       <includedDownloadableComponents />
       <excludedBeans />

README.md

@@ -5,12 +5,12 @@ NinjaTerm
 
 #### A serial port terminal that's got your back.
 
-[![Travis](https://img.shields.io/travis/mbedded-ninja/NinjaTerm.svg)](https://travis-ci.org/mbedded-ninja/NinjaTerm) [![Github All Releases](https://img.shields.io/github/downloads/mbedded-ninja/NinjaTerm/total.svg)](http://mbedded-ninja.github.io/NinjaTerm/)
+[![Travis](https://img.shields.io/travis/gbmhunter/NinjaTerm.svg)](https://travis-ci.org/gbmhunter/NinjaTerm) [![Github All Releases](https://img.shields.io/github/downloads/gbmhunter/NinjaTerm/total.svg)](http://gbmhunter.github.io/NinjaTerm/)
 
 - Maintainer/Primary Author: Geoffrey Hunter <[email protected]> (http://www.mbedded.ninja)
 - Created: 2015-07-15
 - Last Modified: 2018-11-12
-- Version: v1.1.0
+- Version: v1.1.1
 - Company: mbedded.ninja
 - Project: NinjaTerm
 - Language: Java, JavaFX
@@ -25,13 +25,13 @@ NinjaTerm
 Installation
 ============
 
-See the [NinjaTerm homepage](http://mbedded-ninja.github.io/NinjaTerm/).
+See the [NinjaTerm homepage](http://gbmhunter.github.io/NinjaTerm/).
 
 Developing
 ==========
 
 1. Fork repo, then download/clone this repository into a folder on your computer, and make a new `feature/xxx` or `bug/xxx` branch.
-1. Make sure you have a 32-bit version of the JDK installed (must be at least JDK 8).
+1. Make sure you have a 32-bit version of JDK 9 installed (must be JDK 8 asJDK 9, 11 or 12 are not supported).
 1. Download the community edition of Intellij IDEA (it's free!). Load the project using the provided IntelliJ files. Select the JDK installed on your computer.
 1. Download and install gradle. Create a file called `gradle.properties` at `<user home dir>/.gradle/`. Paste the following line into this file: `install4jHomeDir=none` (if creating installable executables, install Install4J and replace `none` with the actual install directory, so it will look something like `install4jHomeDir=C:\\Program Files\\install4j6`).
 1. Make sure you are on the develop branch. Create a new branch from the head of the develop branch to create your new feature on.
@@ -119,4 +119,4 @@ See changelog.md.
 Contributors
 ============
 
-See the [NinjaTerm homepage](http://mbedded-ninja.github.io/NinjaTerm/).
+See the [NinjaTerm homepage](http://gbmhunter.github.io/NinjaTerm/).

build.gradle

@@ -7,11 +7,11 @@ group = 'NinjaTerm'
 // This version number is the master version number which needs to be updated
 // manually. This version number is used to automatically set the one in the README,
 // index.html, and also the one install4j uses (which in turn is the one the app uses at runtime).
-version = '1.1.0'
+version = '1.1.1'
 
 // Project description, shown when
 // "gradle -q projects" is called
-description = """\
+description = """
 A serial port terminal that's got your back.
 ------------------------------------------
 Project version: ${version}

changelog.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v1.1.1] - 2019-04-14
+
+### Added
+- Java is now bundled with the Windows and Mac installers.
+
+### Fixed
+- Broken URLs on homepage.
+
 ## [v1.1.0] - 2018-11-12
 
 ### Added

docs/index.html

@@ -8,13 +8,13 @@
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="css/cayman.css">
     <!-- Preview image when webpage is shared on Open Graph XML sites (e.g. Facebook) -->
-    <meta property="og:image" content="http://mbedded-ninja.github.io/NinjaTerm/img/opengraph-image.png" />
+    <meta property="og:image" content="http://gbmhunter.github.io/NinjaTerm/img/opengraph-image.png" />
     <meta property="og:description" content="A serial port terminal that's got your back."/>
 </head>
 
 <!-- UPDATE THE VERSION ON THE LINE BELOW -->
 <!-- This will automatically all the vX.X.X's scattered through-out this page -->
-<body onload="updateVersionNumber('v1.1.0')">
+<body onload="updateVersionNumber('v1.1.1')">
 
 
 <section class="page-header">
@@ -24,15 +24,15 @@
             <h1 class="project-name">NinjaTerm</h1>
             <h2 class="project-tagline">A serial port terminal that's got your back.</h2>
             <a id="windows-link"
-               href="https://github.com/mbedded-ninja/NinjaTerm/releases/download/vX.X.X/NinjaTerm_vX.X.X_windows.exe"
+               href="https://github.com/gbmhunter/NinjaTerm/releases/download/vX.X.X/NinjaTerm_vX.X.X_windows.exe"
                class="btn">vX.X.X (Win)</a>
             <a id="mac-link"
-               href="https://github.com/mbedded-ninja/NinjaTerm/releases/download/vX.X.X/NinjaTerm_vX.X.X_macos.dmg"
+               href="https://github.com/gbmhunter/NinjaTerm/releases/download/vX.X.X/NinjaTerm_vX.X.X_macos.dmg"
                class="btn">vX.X.X (OS X)</a>
             <a id="nix-link"
-               href="https://github.com/mbedded-ninja/NinjaTerm/releases/download/vX.X.X/NinjaTerm_vX.X.X_unix.sh"
+               href="https://github.com/gbmhunter/NinjaTerm/releases/download/vX.X.X/NinjaTerm_vX.X.X_unix.sh"
                class="btn">vX.X.X (UNIX)</a>
-            <a href="https://github.com/mbedded-ninja/NinjaTerm" class="btn">View on GitHub</a>
+            <a href="https://github.com/gbmhunter/NinjaTerm" class="btn">View on GitHub</a>
             <p style="font-style: italic; font-size: 0.9em;">NinjaTerm requires <a href="https://java.com/en/download/" style="color: #c1c1c1;">Java v1.8 (Java 8)</a> or higher (go on, Java isn't THAT bad)</p>
             <p>NinjaTerm has been downloaded <span id="total-download-count"></span> times.</p>
             <!--<p>
@@ -154,7 +154,7 @@ <h2>UNIX (e.g. Ubuntu)</h2>
 
         <h1>Bugs, Feature Requests, Questions, e.t.c</h1>
 
-        <p>Please <a href="https://github.com/mbedded-ninja/NinjaTerm/issues/">create an issue in the GitHub repository</a>
+        <p>Please <a href="https://github.com/gbmhunter/NinjaTerm/issues/">create an issue in the GitHub repository</a>
             if you want to log a bug, make a feature request, ask a question, e.t.c.</p>
 
 
@@ -196,6 +196,4 @@ <h1>Contributors</h1>
 <script type="text/javascript" src="js/main.js"></script>
 
 <script type="text/javascript" src="js/version-replacement.js"></script>
-
-<!--<script type="text/javascript" src="js/toc.js"></script>-->
 </html>