Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
milux committed Oct 31, 2018
2 parents e805fbf + f591ef4 commit ffb2d19
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 10 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
/builds/*SNAPSHOT.jar
/releases
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The tool was tested with **ProPresenter** background videos, **Native Instrument
JDK 8.0 or higher with `javax.sound.midi` available

## Usage
Build with `./gradlew jar proguard` or take pre-built release from `releases` directory
Build with `./gradlew jar proguard` or download a release JAR

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

Expand Down
25 changes: 17 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
buildscript {
ext.kotlin_version = '1.3.0'

repositories {
mavenCentral()
flatDir dirs: "C:\\proguard\\lib"
}
dependencies {
classpath ":proguard:"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

group 'ppcolor'
version '1.0.1'
plugins {
id "org.jetbrains.kotlin.jvm" version "1.3.0"
id "com.github.breadmoirai.github-release" version "2.2.0"
}

apply plugin: 'kotlin'
apply plugin: 'application'
group 'de.milux.ppcolor'
version '1.0.2'

repositories {
mavenCentral()
}

dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}

compileKotlin {
Expand All @@ -43,4 +42,14 @@ task proguard(type: proguard.gradle.ProGuardTask) {
configuration file('proguard.txt')
injars "build/libs/de.milux.ppcolor-${version}.jar"
outjars "releases/ppcolor-${version}.jar"
}
proguard.dependsOn jar

githubRelease {
token getProperty('github.token')
owner "milux"
repo "ppcolor"
tagName "${version}"
releaseAssets "releases/ppcolor-${version}.jar"
overwrite true
}
File renamed without changes.
File renamed without changes.
Binary file removed releases/ppcolor-1.0.1.jar
Binary file not shown.

0 comments on commit ffb2d19

Please sign in to comment.