Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Preparations for v1.2, adjusted version numbers, updated gradle wrapper, … #73

Merged
merged 1 commit into from
Apr 12, 2024
Merged

Preparations for v1.2, adjusted version numbers, updated gradle wrapper, … #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ Pre-compiled and executable MORTAR distributions can be found attached to the

<p>
<b>Windows:</b> A convenient Windows OS installer executable for MORTAR is available
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.1.1.0/MORTAR_v1.1.1.0_WINx64_installer.exe">here</a> to
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0/MORTAR_v1.2.0.0_WINx64_installer.exe">here</a> to
automatically download the installer .exe of the latest version). Download the installer
executable, start, and follow the instructions to install MORTAR. Note that the installation includes a full
Java Runtime Environment (JRE). After installation, create a shortcut to an appropriate MORTAR start batch file on your
Windows desktop. E.g. for MORTAR to use up to 4 gigabyte of RAM, copy a shortcut to batch file "MORTAR.bat" which is
located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.1.1.0\bin" or the path specified at
located in the MORTAR program folder (default "C:\Program Files\MORTAR\MORTARv1.2.0.0\bin" or the path specified at
installation). To start MORTAR, double-click the created shortcut. MORTAR can be uninstalled by the provided
Uninstall.exe executable in the MORTAR program folder or standard Windows functions.
<br>
Expand All @@ -87,21 +87,21 @@ with your chosen initially allocated memory (-Xms) and maximum value (-Xmx) acco
described below. As an alternative way, they should also work on Windows.
</p>

<p><b>Linux and macOS:</b> Every release has the executable Java ARchive (JAR) "MORTAR-fat-1.1.1.0.jar"
<p><b>Linux and macOS:</b> Every release has the executable Java ARchive (JAR) "MORTAR-fat-1.2.0.0.jar"
attached, which contains the packaged MORTAR code together with all dependencies
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.1.1.0/MORTAR-fat-1.1.1.0.jar">here</a> to
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0/MORTAR-fat-1.2.0.0.jar">here</a> to
automatically download the JAR of the latest version).
To run MORTAR (with up to 4 GB of RAM available, e.g.),
execute the JAR from the command-line using</p>

<p><code>java -jar -Xms512m -Xmx4g [path to]MORTAR-fat-1.1.1.0.jar</code></p>
<p><code>java -jar -Xms512m -Xmx4g [path to]MORTAR-fat-1.2.0.0.jar</code></p>

A JDK or JRE of version 17.0.4 or higher (v21.0.1 for the upcoming release) needs to be installed on your system and linked to the "java" command.
A JDK or JRE of version 21.0.1 or higher needs to be installed on your system and linked to the "java" command.
Otherwise, replace "java" with the path to the java command of your JDK or JRE.<br>

<p>Please note that MORTAR only supports x64 (on all three platforms) and AArch64 (on macOS and Linux) architectures in general.
For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.1.1.0.jar" is available from the distributions attached to the releases and must be used
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.1.1.0/MORTAR-fat-aarch64-1.1.1.0.jar">here</a> to
For the latter, a special "fat JAR" named "MORTAR-fat-aarch64-1.2.0.0.jar" is available from the distributions attached to the releases and must be used
(click <a href="https://github.com/FelixBaensch/MORTAR/releases/download/v1.2.0.0/MORTAR-fat-aarch64-1.2.0.0.jar">here</a> to
automatically download the AArch64 JAR of the latest version).</p>
Also note that using the Windows Subsystem for Linux (WSL) is not recommended, since a lot of additional configurations
have to be made there to run Java GUI applications.
Expand Down Expand Up @@ -135,7 +135,7 @@ into it (i.e. sub-folders of "AdoptOpenJDK\jdk-21.0.1_12_jre\" need to be "bin",
* LibrePDF OpenPDF version 1.3.26
* [OpenPDF GitHub repository](https://github.com/LibrePDF/OpenPDF)
* License: GNU Lesser General Public License 2.1
* Spotless version 6.23
* Spotless version 6.25
* [Spotless GitHub repository](https://github.com/diffplug/spotless)
* License: Apache-2.0 license

Expand Down
Binary file modified Tutorial/MORTAR_Tutorial.pdf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

group 'de.unijena.cheminf'
version '1.1.1.0'
version '1.2.0.0'

sourceCompatibility = 1.21

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading