Skip to content

Commit

Permalink
Build updates
Browse files Browse the repository at this point in the history
- update dependencies
- update gradle wrapper to 4.4
- add atomatic-module configuration
- upgrade travis to oraclejdk9
  • Loading branch information
aalmiray committed Dec 11, 2017
1 parent 23f0509 commit 3e20ae4
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 9 deletions.
11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,19 @@ before_install:
- 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
jdk:
- oraclejdk8
- oraclejdk9
env: TERM=dumb
# after_success:
#  - ./gradlew coveralls
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,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.bootstrapfx
sourceCompatibility=1.8
targetCompatibility=1.8
Expand Down
1 change: 1 addition & 0 deletions gradle/publishing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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
2 changes: 1 addition & 1 deletion subprojects/bootstrapfx-core/bootstrapfx-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ task sourcesJar(type: Jar) {
dependencies {
// upgraded dependencies for compass-gradle
jrubyExec 'org.bouncycastle:bcprov-jdk15on:1.58'
jrubyExec 'org.jruby:jruby-complete:9.1.13.0'
jrubyExec 'org.jruby:jruby-complete:9.1.15.0'
}

javadoc {
Expand Down
1 change: 1 addition & 0 deletions subprojects/bootstrapfx-core/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
moduleName = org.kordamp.bootstrapfx.core
2 changes: 1 addition & 1 deletion subprojects/sampler/sampler.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ mainClassName = 'org.kordamp.bootstrapfx.Sampler'

dependencies {
compile project(':bootstrapfx-core')
compile 'org.fxmisc.richtext:richtextfx:0.7-M5'
compile 'org.fxmisc.richtext:richtextfx:0.8.1'
}

0 comments on commit 3e20ae4

Please sign in to comment.