Update dependencies; upgrade to Gradle 4.10

kordamp · Aug 28, 2018 · f85b8e9 · f85b8e9
1 parent 1f33e76
commit f85b8e9
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 44 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,6 @@ before_script:
 script: ./gradlew clean build 
 jdk:
   - oraclejdk8
-#  - oraclejdk9
 env: TERM=dumb
 # after_success:
 #   - ./gradlew coveralls

diff --git a/build.gradle b/build.gradle
@@ -31,12 +31,12 @@ buildscript {
     dependencies {
         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.8.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'org.ajoberstar:gradle-git:1.7.2'
         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 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
+        classpath 'net.nemerosa:versioning:2.7.1'
+        classpath 'org.kordamp.gradle:jdeps-gradle-plugin:0.3.0'
         classpath 'gradle.plugin.net.ossindex:ossindex-gradle-plugin:0.1.1'
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=0.2.3
+version=0.2.4-SNAPSHOT
 group=org.kordamp.bootstrapfx
 sourceCompatibility=1.8
 targetCompatibility=1.8

diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
@@ -45,47 +45,40 @@ jar {
     }
 }
 
-def pomConfig = {
-    packaging 'jar'
-    name project.name
-    description project.project_description
-    url project.project_url
-    inceptionYear '2015'
-    licenses {
-        license([:]) {
-            name 'MIT License'
-            url 'http://opensource.org/licenses/MIT'
-            distribution 'repo'
-        }
-    }
-    scm {
-        url project.project_scm
-    }
-    developers {
-        [
-            aalmiray : 'Andres Almiray'
-        ].each { devId, devName ->
-            developer {
-                id devId
-                name devName
-                roles {
-                    role 'Developer'
-                }
-            }
-        }
-    }
-}
-
 publishing {
     publications {
         mavenCustom(MavenPublication) {
             from components.java
             artifact sourcesJar
             artifact javadocJar
 
-            pom.withXml {
-                asNode().children().last() + pomConfig
-                asNode().appendNode('description', project.project_description)
+            pom {
+                name = project.name
+                description = project.project_description
+                url = project.project_url
+                packaging = 'jar'
+                inceptionYear = '2015'
+                licenses {
+                    license {
+                        name = 'MIT License'
+                        url = 'http://opensource.org/licenses/MIT'
+                        distribution = 'repo'
+                    }
+                }
+                scm {
+                    url = project.project_scm
+                }
+                developers {
+                    [
+                        aalmiray : 'Andres Almiray'
+                    ].each { devId, devName ->
+                        developer {
+                            id = devId
+                            name = devName
+                            roles = ['Developer']
+                        }
+                    }
+                }
             }
         }
     }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/subprojects/bootstrapfx-core/bootstrapfx-core.gradle b/subprojects/bootstrapfx-core/bootstrapfx-core.gradle
@@ -27,7 +27,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:gradle-processes:0.4.1'
+        classpath 'gradle.plugin.com.github.jengelman.gradle.plugins:gradle-processes:0.5.0'
         classpath 'com.github.robfletcher:compass-gradle-plugin:2.0.6'
     }
 }
@@ -48,7 +48,7 @@ task sourcesJar(type: Jar) {
 dependencies {
     // upgraded dependencies for compass-gradle
     jrubyExec 'org.bouncycastle:bcprov-jdk15on:1.59'
-    jrubyExec 'org.jruby:jruby-complete:9.1.16.0'
+    jrubyExec 'org.jruby:jruby-complete:9.2.0.0'
 }
 
 javadoc {

diff --git a/subprojects/sampler/sampler.gradle b/subprojects/sampler/sampler.gradle
@@ -26,5 +26,5 @@ mainClassName = 'org.kordamp.bootstrapfx.Sampler'
 
 dependencies {
     compile project(':bootstrapfx-core')
-    compile 'org.fxmisc.richtext:richtextfx:0.8.2'
+    compile 'org.fxmisc.richtext:richtextfx:0.9.1'
 }