diff --git a/.rultor.yml b/.rultor.yml
index 01203ab..94100f1 100644
--- a/.rultor.yml
+++ b/.rultor.yml
@@ -25,4 +25,4 @@ release:
   script: |-
     cp -v ../gradle.properties ../secring.gpg ./
     ./gradlew updateVersion -PnewVersion=${tag}
-    ./gradlew clean ready signArchives bintrayUpload --info
+    ./gradlew clean ready signMavenPublication bintrayUpload --info
diff --git a/build.gradle b/build.gradle
index e02075c..d2aad53 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,5 @@
-import groovy.io.FileType
-
 plugins {
-    id "com.jfrog.bintray" version "1.7" apply false
+    id "com.jfrog.bintray" version "1.8.4" apply false
 }
 
 ext {
@@ -61,7 +59,7 @@ defaultTasks 'clean', 'ready'
 
 //task to write the version parameter given via command line into the "gradle.properties" files.
 // Call with: gradle updateVersion -PnewVersion=1.0.1-SNAPSHOT
-task('updateVersion') << {
+task('updateVersion') {
     if (project.hasProperty('newVersion')) {
         //set version in gradle settings
         project.version = project.newVersion
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
index 56c7494..c8ddb23 100644
--- a/gradle/bintray.gradle
+++ b/gradle/bintray.gradle
@@ -19,44 +19,6 @@ artifacts {
     archives sourcesJar
 }
 
-signing {
-    sign configurations.archives
-}
-
-bintray {
-    user = bintrayUser
-    key = bintrayApiKey
-    publications = ['maven']
-    publish = true
-    filesSpec {
-        from("${buildDir}/libs") {
-            include '*.jar.asc'
-        }
-        from("${buildDir}/publications/maven") {
-            include 'pom-default.xml.asc'
-            rename 'pom-default.xml.asc', "${project.name}-${project.version}.pom.asc"
-        }
-        into "${project.group.replaceAll(/\./, '/')}/${project.name}/${project.version}"
-    }
-    pkg {
-        userOrg = BINTRAY_ORG
-        repo = rootProject.name
-        name = project.name
-        licenses = ['Apache-2.0']
-        vcsUrl = GITHUB_URL
-        publicDownloadNumbers = true
-        version {
-            name = project.version
-            vcsTag = project.version
-            mavenCentralSync {
-                sync = true
-                user = sonatypeUsername
-                password = sonatypePassword
-            }
-        }
-    }
-}
-
 // Create the pom configuration:
 def pomConfig = {
     licenses {
@@ -98,4 +60,42 @@ publishing {
             }
         }
     }
-}
\ No newline at end of file
+}
+
+signing {
+    sign publishing.publications.maven
+}
+
+bintray {
+    user = bintrayUser
+    key = bintrayApiKey
+    publications = ['maven']
+    publish = true
+    filesSpec {
+        from("${buildDir}/libs") {
+            include '*.jar.asc'
+        }
+        from("${buildDir}/publications/maven") {
+            include 'pom-default.xml.asc'
+            rename 'pom-default.xml.asc', "${project.name}-${project.version}.pom.asc"
+        }
+        into "${project.group.replaceAll(/\./, '/')}/${project.name}/${project.version}"
+    }
+    pkg {
+        userOrg = BINTRAY_ORG
+        repo = rootProject.name
+        name = project.name
+        licenses = ['Apache-2.0']
+        vcsUrl = GITHUB_URL
+        publicDownloadNumbers = true
+        version {
+            name = project.version
+            vcsTag = project.version
+            mavenCentralSync {
+                sync = true
+                user = sonatypeUsername
+                password = sonatypePassword
+            }
+        }
+    }
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 6ffa237..29953ea 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index efa6f15..ee67112 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Mar 13 16:56:27 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
diff --git a/gradlew b/gradlew
index 9aa616c..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -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
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/sunshine-core/build.gradle b/sunshine-core/build.gradle
index 3d31fe8..084a02b 100644
--- a/sunshine-core/build.gradle
+++ b/sunshine-core/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     compileOnly 'org.projectlombok:lombok:1.16.14'
+    annotationProcessor 'org.projectlombok:lombok:1.16.14'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
     testCompile 'junit:junit:4.11'
     testCompile 'com.github.stefanbirkner:system-rules:1.18.0'
diff --git a/sunshine-junit4-integration-tests/build.gradle b/sunshine-junit4-integration-tests/build.gradle
index dcfc9b4..9402f26 100644
--- a/sunshine-junit4-integration-tests/build.gradle
+++ b/sunshine-junit4-integration-tests/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.3'
     }
 }
 
diff --git a/sunshine-junit4/build.gradle b/sunshine-junit4/build.gradle
index 97a435f..f8cd27e 100644
--- a/sunshine-junit4/build.gradle
+++ b/sunshine-junit4/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     compileOnly 'org.projectlombok:lombok:1.16.14'
+    annotationProcessor 'org.projectlombok:lombok:1.16.14'
     compile 'junit:junit:4.11'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
 }
diff --git a/sunshine-testng/build.gradle b/sunshine-testng/build.gradle
index 3b60d87..1167729 100644
--- a/sunshine-testng/build.gradle
+++ b/sunshine-testng/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     compileOnly 'org.projectlombok:lombok:1.16.14'
+    annotationProcessor 'org.projectlombok:lombok:1.16.14'
     compile 'org.testng:testng:6.11'
     testCompile 'org.hamcrest:hamcrest-all:1.3'
     testCompile 'junit:junit:4.11'