feat: bump minimum Java version to Java 7 as we dont support OSX anymore

This commit is contained in:
Ryan Dowling 2018-05-27 12:47:33 +10:00
parent 885eca7819
commit e6160be92c
3 changed files with 50 additions and 21 deletions

View file

@ -1,5 +1,6 @@
# Changelog
## 3.2.3.9
- Fix issues installing some libraries on OSX
## 3.2.3.10
- Switch to https for all urls
- Require minimum version of Java 7

View file

@ -1,37 +1,48 @@
# ATLauncher
[![Build Status](https://build.atlcdn.net/buildStatus/icon?job=ATLauncher)](https://build.atlcdn.net/job/ATLauncher/)
## What is it?
ATLauncher is a Launcher for Minecraft which integrates multiple different ModPacks to allow you to download and install
ModPacks easily and quickly.
## Links
- [ATLauncher Website](https://www.atlauncher.com)
- [ATLauncher Facebook](http://www.facebook.com/ATLauncher)
- [ATLauncher Reddit](http://www.reddit.com/r/ATLauncher)
- [ATLauncher Twitter](http://twitter.com/ATLauncher)
* [ATLauncher Website](https://www.atlauncher.com)
* [ATLauncher Facebook](http://www.facebook.com/ATLauncher)
* [ATLauncher Reddit](http://www.reddit.com/r/ATLauncher)
* [ATLauncher Twitter](http://twitter.com/ATLauncher)
## Coding Standards & Styling Guidelines
Please see the [STYLE.md](STYLE.md) file for coding standards and style guidelines.
## Contributing to ATLauncher
If you wish to contribute to ATLauncher in any way, take a look at [CONTRIBUTING.md](CONTRIBUTING.md)
## Testing
Please see the [TESTING.md](TESTING.md) file for information on how we write tests.
## Building
### Windows
#### Requirements
##### Java Development Kit (JDK)
Download and install the latest version from
[Oracle's Java Downloads page](http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html).
##### Apache Maven
Install Apache Maven via the official [Apache Maven Install Docs](http://maven.apache.org/download.cgi#Installation).
Download Apache Maven via the official [download site](http://maven.apache.org/download.cgi).
Make sure to follow the [installation docs](http://maven.apache.org/install.html).
##### launch4j
Download and install [launch4j](http://sourceforge.net/projects/launch4j/files/launch4j-3/3.1.0-beta2/).
Make sure to add the directory containing launch4jc to your executable path which for me on 64bit Windows was:
@ -41,18 +52,21 @@ Make sure to add the directory containing launch4jc to your executable path whic
```
## Running the application
If you wish to run the application in development, you can run the following:
```
mvn exec:java -Dexec.args='--working-dir=D:\\ATLauncher-Testing'
mvn exec:java
```
Making sure to change the directory to a working directory you wish to use.
All working files will be put in the `testDir` directory.
## Building artifacts
To build artifacts for release, simply run `mvn install`.
## Building artefacts
To build artefacts for release, simply run `mvn install`.
## Plugging In Your Data
To get started with the code and plug in your own data, you need to edit the
/src/main/java/com/atlauncher/data/Constants.java file.
@ -62,42 +76,50 @@ bottom for more.
See below for explanations as to what each constant means.
### VERSION
This is a LauncherVersion object passed in the reserved, major, minor, revision ints for this version of the launcher.
See the 'Versioning System' section below.
### API_BASE_URL
This is a link to your server side API for processing of leaderboard times and pack installs. This is optional and can
be removed. We do not give implementation code, this is your own doing.
### PASTE_CHECK_URL
This is a link to the url where an instance of [stikked](https://github.com/claudehohl/Stikked) is running (For instance
http://www.mypaste.com) this is how the launcher knows if the paste was successful by checking the response from the API
for the url of the software.
*Please note that the domain given above IS NOT REAL. You must install [stikked](https://github.com/claudehohl/Stikked)
on your own domain and reference it, the domain is only there as an example of what a valid value is.*
_Please note that the domain given above IS NOT REAL. You must install [stikked](https://github.com/claudehohl/Stikked)
on your own domain and reference it, the domain is only there as an example of what a valid value is._
### PASTE_API_URL
This is a link to the create api command for the instance of [stikked](https://github.com/claudehohl/Stikked) is running
(For instance http://www.mypaste.com/api/create/)
*Please note that the domain given above IS NOT REAL. You must install [stikked](https://github.com/claudehohl/Stikked)
on your own domain and reference it, the domain is only there as an example of what a valid value is.*
_Please note that the domain given above IS NOT REAL. You must install [stikked](https://github.com/claudehohl/Stikked)
on your own domain and reference it, the domain is only there as an example of what a valid value is._
### SERVERS
This is an array of
[Server](https://github.com/ATLauncher/ATLauncher/blob/master/src/main/java/com/atlauncher/data/Server.java) type
elements the launcher uses as a base to download files.
### LAUNCHER_NAME
This is the name of the launcher.
### How to make your data
To make the data the Launcher needs you will need to figure out your own server side way of doing that. You can create a
system to do it automatically or you can manually do it by just popping the files on the server. The best way to get the
file structure and contents is to examine the source code and the ATLauncher files it downloads.
## Versioning System
Starting with version 3.2.1.0 a new versioning system was put into place. It works off the following:
Reserved.Major.Minor.Revision.Build
@ -115,9 +137,11 @@ Build is used for beta releases allowing you to have higher version numbers but
release comes.
## Need Help/Have Questions?
If you have questions please don't hesitate to [contact us](https://www.atlauncher.com/contact-us/)
## License
This work is licensed under the GNU General Public License v3.0. To view a copy of this license, visit
http://www.gnu.org/licenses/gpl-3.0.txt.

12
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>com.atlauncher</groupId>
<artifactId>atlauncher</artifactId>
<name>ATLauncher</name>
<version>3.2.3.9</version>
<version>3.2.3.10</version>
<organization>
<name>ATLauncher</name>
<url>http://www.github.com/ATLauncher/</url>
@ -19,7 +19,7 @@
<url>https://www.atlauncher.com</url>
<properties>
<project.jdk.version>1.6</project.jdk.version>
<project.jdk.version>1.7</project.jdk.version>
<mainclass>com.atlauncher.App</mainclass>
</properties>
@ -110,6 +110,10 @@
</executions>
<configuration>
<mainClass>com.atlauncher.App</mainClass>
<arguments>
<argument>--working-dir</argument>
<argument>./testDir</argument>
</arguments>
</configuration>
</plugin>
<plugin>
@ -175,7 +179,7 @@
<preCp>anything</preCp>
</classPath>
<jre>
<minVersion>1.6.0</minVersion>
<minVersion>1.7.0</minVersion>
<runtimeBits>64/32</runtimeBits>
</jre>
<icon>src/main/resources/assets/image/Icon.ico</icon>
@ -224,7 +228,7 @@
filemode="755"/>
</zip>
<delete dir="{project.build.directory}/${project.name}.app"/>
</target>
</target>
</configuration>
<goals>
<goal>run</goal>