Skip to content

Commit

Permalink
Build updates
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Dec 11, 2017
1 parent debf7d4 commit f4fdad0
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 13 deletions.
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: java
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sudo apt-get update -qq
- sudo apt-get install oracle-java8-installer
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.sonar/cache/
before_script:
- ./gradlew --version
script: ./gradlew clean build
jdk: oraclejdk8
env: TERM=dumb
4 changes: 3 additions & 1 deletion README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
:project-name: jsilhouette
:project-group: org.kordamp.jsilhouette

image:http://img.shields.io/travis/aalmiray/{project-name}/master.svg["Build Status (travis)", link="https://travis-ci.org/aalmiray/{project-name}"]
image:http://img.shields.io/badge/license-ASL2-blue.svg["ASL3 Licensed", link="http://opensource.org/licenses/ASL2"]
image:https://api.bintray.com/packages/{project-owner}/{project-repo}/{project-name}/images/download.svg[link="https://bintray.com/{project-owner}/{project-repo}/{project-name}/_latestVersion"]
image:https://img.shields.io/maven-central/v/{project-group}/{project-name}-javafx.svg?label=maven[link="https://search.maven.org/#search|ga|1|{project-group}"]
image:https://img.shields.io/badge/donations-Patreon-orange.svg[link="https://www.patreon.com/user?u=6609318"]

---

Expand All @@ -25,7 +27,7 @@ and usage.
You must meet the following requirements:

* JDK8u40 as a minimum
* Gradle 2.14
* Gradle 4.4

You may used the included gradle wrapper script if you don't have `gradle` installed.

Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ buildscript {
}

dependencies {
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1'
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2'
classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
classpath 'org.ajoberstar:gradle-git:1.7.2'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.15.0'
classpath 'org.kordamp.gradle:stats-gradle-plugin:0.2.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.17.0'
classpath 'net.nemerosa:versioning:2.6.1'
classpath 'org.kordamp.gradle:jdeps-gradle-plugin:0.2.0'
classpath 'gradle.plugin.net.ossindex:ossindex-gradle-plugin:0.1.1'
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version=0.2.1
version=0.2.2
group=org.kordamp.jsilhouette
sourceCompatibility=1.7
targetCompatibility=1.7
Expand Down
2 changes: 1 addition & 1 deletion gradle/code-coverage.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
apply plugin: 'jacoco'

jacoco {
toolVersion = '0.7.7.201606060606'
toolVersion = '0.7.9'
}

jacocoTestReport {
Expand Down
1 change: 1 addition & 0 deletions gradle/publishing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jar {
'Specification-Version': project.version,
'Implementation-Title': project.name,
'Implementation-Version': project.version,
'Automatic-Module-Name': project.moduleName
)
}
metaInf {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
6 changes: 1 addition & 5 deletions subprojects/guide/guide.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.7'
classpath 'com.bmuschko:gradle-java2html-plugin:2.0'
}
}
Expand Down Expand Up @@ -129,10 +129,6 @@ java2html {
}
}

asciidoctorj {
version = '1.5.4.1'
}

asciidoctor {
sourceDir = file('src/asciidoc')
attributes = [
Expand Down
1 change: 1 addition & 0 deletions subprojects/jsilhouette-javafx/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
sourceCompatibility=1.8
targetCompatibility=1.8
publishJars=true
moduleName=org.kordamp.jsilhouette.javafx

0 comments on commit f4fdad0

Please sign in to comment.