Skip to content

Commit 39eb2b4

Browse files
committed
make it compile
1 parent 3a9da2a commit 39eb2b4

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

build.gradle

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
plugins {
2+
id 'com.github.ben-manes.versions' version '0.20.0'
3+
}
4+
15
apply plugin: 'java'
26

37
sourceCompatibility = 1.8
@@ -10,7 +14,8 @@ repositories {
1014

1115
dependencies {
1216
testCompile 'io.reactivex:rxjava:1.2.2'
13-
testCompile 'io.reactivex:rxnetty-http:0.5.2-rc.4'
17+
testCompile 'io.reactivex:rxnetty-http:0.5.2'
18+
testCompile 'io.netty:netty-all:4.1.32.Final'
1419
testCompile 'com.netflix.hystrix:hystrix-core:1.5.8'
1520
testCompile 'com.netflix.hystrix:hystrix-metrics-event-stream:1.5.8'
1621

@@ -55,7 +60,3 @@ dependencies {
5560
testCompile 'org.assertj:assertj-core:3.5.2'
5661
testCompile 'org.mockito:mockito-core:2.2.15'
5762
}
58-
59-
task wrapper(type: Wrapper) {
60-
gradleVersion = '3.1'
61-
}

gradle/wrapper/gradle-wrapper.jar

3.17 KB
Binary file not shown.
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Nov 19 14:44:58 CET 2016
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.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)