Skip to content

Commit

Permalink
Update build settings
Browse files Browse the repository at this point in the history
  • Loading branch information
aalmiray committed Sep 27, 2017
1 parent 120fa0b commit 23f0509
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 21 deletions.
17 changes: 15 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@ import java.text.SimpleDateFormat
buildscript {
repositories {
jcenter()
maven { url 'https://plugins.gradle.org/m2/' }
}

dependencies {
classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.1'
classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'org.ajoberstar:gradle-git:1.7.1'
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 'net.nemerosa:versioning:2.6.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 All @@ -31,6 +34,8 @@ allprojects {
apply plugin: 'base'
apply plugin: 'idea'
apply plugin: 'com.github.ben-manes.versions'
apply plugin: 'net.ossindex.audit'
apply plugin: 'org.kordamp.jdeps'

repositories {
jcenter()
Expand All @@ -41,6 +46,14 @@ allprojects {
options.addStringOption('Xdoclint:none', '-quiet')
}
}

audit {
failOnError = false
}

jdeps {
failOnError = false
}
}

subprojects { subproj ->
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Tue Apr 11 10:32:36 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2-bin.zip
6 changes: 3 additions & 3 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand Down Expand Up @@ -155,7 +155,7 @@ if $cygwin ; then
fi

# Escape application args
save ( ) {
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
Expand Down
27 changes: 15 additions & 12 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
include 'subprojects/bootstrapfx-core'
include 'subprojects/sampler'

rootProject.name = 'bootstrapfx'
rootProject.children.each { project ->
int slash = project.name.indexOf('/')
String fileBaseName = project.name[(slash + 1)..-1]
String projectDirName = project.name
project.name = fileBaseName
project.projectDir = new File(settingsDir, projectDirName)
project.buildFileName = "${fileBaseName}.gradle"
assert project.projectDir.isDirectory()
assert project.buildFile.isFile()

def includeProject = { String projectDirName, String projectName ->
File baseDir = new File(settingsDir, projectDirName)
File projectDir = new File(baseDir, projectName)
String buildFileName = "${projectName}.gradle"

assert projectDir.isDirectory()
assert new File(projectDir, buildFileName).isFile()

include projectName
project(":${projectName}").projectDir = projectDir
project(":${projectName}").buildFileName = buildFileName
}

includeProject 'subprojects', 'bootstrapfx-core'
includeProject 'subprojects', 'sampler'
4 changes: 2 additions & 2 deletions subprojects/bootstrapfx-core/bootstrapfx-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ task sourcesJar(type: Jar) {

dependencies {
// upgraded dependencies for compass-gradle
jrubyExec 'org.bouncycastle:bcprov-jdk15on:1.57'
jrubyExec 'org.jruby:jruby-complete:9.1.10.0'
jrubyExec 'org.bouncycastle:bcprov-jdk15on:1.58'
jrubyExec 'org.jruby:jruby-complete:9.1.13.0'
}

javadoc {
Expand Down

0 comments on commit 23f0509

Please sign in to comment.