Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
mayuso committed Apr 6, 2021
2 parents b6c8f0b + b776eb8 commit c19e9be
Show file tree
Hide file tree
Showing 21 changed files with 232 additions and 382 deletions.
8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,8 @@ proguard/
*.iws
.idea/

# Gradle
.gradletasknamecache
.gradle/
build/
bin/
out/
# Maven
target/

# JMarkPad Preference
jmarkpad.properties
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: java

jdk:
- oraclejdk8
- openjdk13

notifications:
slack:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file.

## [1.1] - 23-08-2018
### Added
- Changed "config.xml" to "jmarkpad.properties". (JMarkPad no longer user XML files)
- Changed "config.xml" to "jmarkpad.properties" (JMarkPad no longer uses XML files).
- JMarkPad will now remember the last directory you worked in and open it by default the next time you are searching for your documents.
- Unique changelog file

Expand Down
24 changes: 6 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,17 @@ We are constantly trying to improve JMarkPad, you can see the known bugs and pla

### Other useful information

[![Build Status](https://travis-ci.org/mayuso/JMarkPad.svg?branch=develop)](https://travis-ci.org/mayuso/JMarkPad)
[![Build Status](https://travis-ci.org/mayuso/JMarkPad.svg?branch=development)](https://travis-ci.org/mayuso/JMarkPad)

## Development

### How to build

* Download and install [JDK 8](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) (Latest version tested: 8u181).
* Download and install [Gradle](https://gradle.org/releases/) (Latest version tested: 4.9).
1. Download and install [OpenJDK 13](https://jdk.java.net/13/).
2. Download and install [Maven](https://maven.apache.org/download.cgi) (Latest version tested: 3.6.2).

To create a java executable (`.jar`) run `gradle build` -> Go to build/libs to find `JMarkPad.jar`.
* To run JMarkPad run `mvn clean javafx:run`
* To create an executable package run `mvn clean compile package`

To create a windows executable (`.exe`) run `gradle jfxNative` -> Go to build/jfx/native to find the JMarkPad folder, this folder will include `JMarkPad.exe` as well as a Java Runtime Environment to be able to run JMarkPad without Java installed.
The file will be located in `target/JMarkPad.jar`

### Versioning

We use [Semantic Versioning 2.0.0](http://semver.org/) for versioning. For the versions available, see the [releases on this repository](https://github.com/mayuso/JMarkPad/releases).

### Authors

* **Mikel Ayuso** - *Initial work* - [Mayuso](https://github.com/mayuso)

See also the list of [contributors](https://github.com/mayuso/JMarkPad/graphs/contributors) who participated in this project.

### License

This project is licensed under the Apache License 2.0 - see the [LICENSE.md](LICENSE.md) file for details
67 changes: 0 additions & 67 deletions build.gradle

This file was deleted.

Binary file removed gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties

This file was deleted.

172 changes: 0 additions & 172 deletions gradlew

This file was deleted.

Loading

0 comments on commit c19e9be

Please sign in to comment.