Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
milux committed Oct 31, 2018
2 parents 224d34d + 814c2b4 commit e805fbf
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/.idea
/build
/out
/*.jar
/builds/*SNAPSHOT.jar
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### Version 1.0.1
- Clarified documentation for build instructions

### Version 1.0
- Initial version
- Constants require adaptation for use
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,12 @@ Combined with a MIDI-capable light control system is meant to provide an "Ambili
The tool was tested with **ProPresenter** background videos, **Native Instruments Komplete Audio 6** sound/MIDI interface and a **grandMA2 onPC** light control system.

## Requirements
Java SE 8.0 or higher with `javax.sound.midi` available
JDK 8.0 or higher with `javax.sound.midi` available

## Usage
`java -jar ppcolor.jar`
Build with `./gradlew jar proguard` or take pre-built release from `releases` directory

Run with `java -jar ppcolor-<version>.jar`

## Output
The program will print 2 Color values for every measurement:
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
}

group 'ppcolor'
version '1.0-SNAPSHOT'
version '1.0.1'

apply plugin: 'kotlin'
apply plugin: 'application'
Expand Down Expand Up @@ -41,6 +41,6 @@ jar {

task proguard(type: proguard.gradle.ProGuardTask) {
configuration file('proguard.txt')
injars 'build\\libs\\de.milux.ppcolor-1.0-SNAPSHOT.jar'
outjars 'ppcolor-1.0-SNAPSHOT.jar'
injars "build/libs/de.milux.ppcolor-${version}.jar"
outjars "releases/ppcolor-${version}.jar"
}
Binary file added releases/ppcolor-1.0.1.jar
Binary file not shown.
File renamed without changes.
File renamed without changes.

0 comments on commit e805fbf

Please sign in to comment.