Skip to content

Commit

Permalink
Update build settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Andres Almiray committed Dec 2, 2019
1 parent 759e67c commit 2693a18
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 24 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ cache:
- $HOME/.sonar/cache/
before_script:
- ./gradlew --version
script: ./gradlew clean build
script: ./gradlew clean build -S
jdk:
- oraclejdk8
- openjdk8
env: TERM=dumb
# after_success:
#  - ./gradlew coveralls
Expand Down
22 changes: 2 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
plugins {
id 'org.kordamp.gradle.kordamp-parentpom' version '1.8.0'
id 'org.kordamp.gradle.source-xref' version '0.29.0' apply false
id 'org.kordamp.gradle.kordamp-parentpom' version '1.9.1'
id 'org.kordamp.gradle.source-xref' version '0.30.3' apply false
}

config {
Expand Down Expand Up @@ -55,19 +55,6 @@ config {
allprojects {
apply plugin: 'idea'

dependencyUpdates.resolutionStrategy = {
componentSelection { rules ->
rules.all { selection ->
boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm'].any { qualifier ->
selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
}
if (rejected) {
selection.reject('Release candidate')
}
}
}
}

license {
mapping {
fxml = 'XML_STYLE'
Expand All @@ -78,9 +65,4 @@ allprojects {

subprojects { subproj ->
apply plugin: 'java'

subproj.tasks.withType(JavaCompile) {
sourceCompatibility = subproj.sourceCompatibility
targetCompatibility = subproj.targetCompatibility
}
}
3 changes: 1 addition & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ pluginManagement {
jcenter()
gradlePluginPortal()
maven { url 'https://sandec.bintray.com/repo' }
mavenLocal()
}
}

Expand All @@ -36,7 +35,7 @@ buildscript {
mavenLocal()
}
dependencies {
classpath 'org.kordamp.gradle:settings-gradle-plugin:0.29.0'
classpath 'org.kordamp.gradle:settings-gradle-plugin:0.30.3'
}
}
apply plugin: 'org.kordamp.gradle.settings'
Expand Down

0 comments on commit 2693a18

Please sign in to comment.