Skip to content

Commit 087e6c9

Browse files
sarmbrusterjexp
authored andcommitted
upgrade to gradle 4.1 and gradle plugin updates
1 parent bc7ecf8 commit 087e6c9

File tree

4 files changed

+19
-39
lines changed

4 files changed

+19
-39
lines changed

build.gradle

+5-27
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1-
buildscript {
2-
repositories {
3-
mavenCentral()
4-
}
5-
dependencies {
6-
classpath "io.codearte.gradle.nexus:gradle-nexus-staging-plugin:0.5.3"
7-
}
8-
}
9-
101
plugins {
112
id 'java'
123
id 'idea'
13-
id 'com.github.johnrengelman.shadow' version '1.2.4'
4+
id 'com.github.johnrengelman.shadow' version '2.0.1'
145
id "org.asciidoctor.convert" version "1.5.3"
156
id "com.bmuschko.nexus" version "2.3.1"
16-
id "me.champeau.gradle.jmh" version "0.3.1"
7+
id "me.champeau.gradle.jmh" version "0.4.4"
8+
id "io.codearte.nexus-staging" version "0.9.0"
179
}
1810
asciidoctorj {
1911
version = '1.5.5'
@@ -48,9 +40,9 @@ ext {
4840
}
4941

5042
repositories {
51-
mavenLocal()
52-
maven { url "https://m2.neo4j.org/content/repositories/snapshots" }
43+
//mavenLocal() // please don't add mavenLocal here - it causes the build to be dependent on local existence of jar files
5344
mavenCentral()
45+
maven { url "https://m2.neo4j.org/content/repositories/snapshots" }
5446
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
5547
// maven { url "https://m2.neo4j.org/content/groups/everything/" }
5648
}
@@ -116,20 +108,6 @@ javadoc {
116108
options.addStringOption('Xdoclint:none', '-quiet')
117109
}
118110

119-
shadowJar {
120-
dependencies {
121-
include(dependency('commons-codec:commons-codec'))
122-
include(dependency('org.hdrhistogram:HdrHistogram'))
123-
include(dependency('com.jayway.jsonpath:json-path'))
124-
include(dependency('net.minidev:asm'))
125-
include(dependency('net.minidev:json-smart'))
126-
include(dependency('org.slf4j:slf4j-api'))
127-
include(dependency('net.minidev:accessors-smart'))
128-
include(dependency('com.github.javafaker:javafaker'))
129-
}
130-
}
131-
132-
133111
/**************
134112
* ASCIIDOCTOR *
135113
**************/

gradle/wrapper/gradle-wrapper.jar

1.85 KB
Binary file not shown.
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Tue Aug 16 14:27:26 CEST 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
43
zipStoreBase=GRADLE_USER_HOME
54
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip

gradlew

+13-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
22

33
##############################################################################
44
##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
3333
# Use the maximum available, or set MAX_FD != -1 to use that value.
3434
MAX_FD="maximum"
3535

36-
warn ( ) {
36+
warn () {
3737
echo "$*"
3838
}
3939

40-
die ( ) {
40+
die () {
4141
echo
4242
echo "$*"
4343
echo
@@ -154,16 +154,19 @@ if $cygwin ; then
154154
esac
155155
fi
156156

157-
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158-
function splitJvmOpts() {
159-
JVM_OPTS=("$@")
157+
# Escape application args
158+
save () {
159+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160+
echo " "
160161
}
161-
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162-
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
162+
APP_ARGS=$(save "$@")
163+
164+
# Collect all arguments for the java command, following the shell quoting and substitution rules
165+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
163166

164167
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
165-
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
168+
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
166169
cd "$(dirname "$0")"
167170
fi
168171

169-
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
172+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)