Skip to content

Commit

Permalink
upgrade to gradle 4.1 and gradle plugin updates
Browse files Browse the repository at this point in the history
  • Loading branch information
sarmbruster authored and jexp committed Aug 9, 2017
1 parent bc7ecf8 commit 087e6c9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 39 deletions.
32 changes: 5 additions & 27 deletions build.gradle
@@ -1,19 +1,11 @@
buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
}
}

plugins {
id 'java'
id 'idea'
id 'com.github.johnrengelman.shadow' version '1.2.4'
id 'com.github.johnrengelman.shadow' version '2.0.1'
id "org.asciidoctor.convert" version "1.5.3"
id "com.bmuschko.nexus" version "2.3.1"
id "me.champeau.gradle.jmh" version "0.3.1"
id "me.champeau.gradle.jmh" version "0.4.4"
id "io.codearte.nexus-staging" version "0.9.0"
}
asciidoctorj {
version = '1.5.5'
Expand Down Expand Up @@ -48,9 +40,9 @@ ext {
}

repositories {
mavenLocal()
maven { url "https://m2.neo4j.org/content/repositories/snapshots" }
//mavenLocal() // please don't add mavenLocal here - it causes the build to be dependent on local existence of jar files
mavenCentral()
maven { url "https://m2.neo4j.org/content/repositories/snapshots" }
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
// maven { url "https://m2.neo4j.org/content/groups/everything/" }
}
Expand Down Expand Up @@ -116,20 +108,6 @@ javadoc {
options.addStringOption('Xdoclint:none', '-quiet')
}

shadowJar {
dependencies {
include(dependency('commons-codec:commons-codec'))
include(dependency('org.hdrhistogram:HdrHistogram'))
include(dependency('com.jayway.jsonpath:json-path'))
include(dependency('net.minidev:asm'))
include(dependency('net.minidev:json-smart'))
include(dependency('org.slf4j:slf4j-api'))
include(dependency('net.minidev:accessors-smart'))
include(dependency('com.github.javafaker:javafaker'))
}
}


/**************
* ASCIIDOCTOR *
**************/
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
@@ -1,6 +1,5 @@
#Tue Aug 16 14:27:26 CEST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
23 changes: 13 additions & 10 deletions gradlew
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
Expand Down 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 @@ -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" "$@"

0 comments on commit 087e6c9

Please sign in to comment.