Skip to content
This repository was archived by the owner on Sep 15, 2023. It is now read-only.

Commit a62793a

Browse files
committed
Update gradle version
1 parent 9832d11 commit a62793a

File tree

6 files changed

+29
-16
lines changed

6 files changed

+29
-16
lines changed

.travis.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
os: windows
12
language: java
23
jdk:
3-
- oraclejdk8
4+
- oraclejdk8
5+
- oraclejdk11

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ repositories {
1414
}
1515

1616
dependencies {
17-
testCompile group: 'junit', name: 'junit', version: '4.11'
17+
testCompile group: 'junit', name: 'junit', version: '4.12'
1818
compile fileTree(dir: 'libs', include: '*.jar')
1919
}
2020

2121
jar {
2222
from sourceSets.main.allSource
2323
}
2424

25-
task wrapper(type: Wrapper) {
26-
gradleVersion = '4.4'
25+
wrapper {
26+
gradleVersion = "4.9"
2727
}

gradle/wrapper/gradle-wrapper.jar

1.37 KB
Binary file not shown.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jan 05 09:23:16 EST 2018
1+
#Mon Dec 31 08:33:00 EST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

gradlew

Lines changed: 13 additions & 10 deletions
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" "$@"

src/test/java/com/kylecorry/frc/vision/contourFilters/ConvexHullContourFilterTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import com.kylecorry.frc.vision.contourFinders.ContourFinder;
44
import com.kylecorry.frc.vision.contourFinders.StandardContourFinder;
5+
import com.kylecorry.frc.vision.testUtils.OpenCVManager;
6+
import com.kylecorry.frc.vision.testUtils.SystemProperties;
7+
import org.junit.Before;
58
import org.junit.Test;
69
import org.opencv.core.*;
710
import org.opencv.imgproc.Imgproc;
@@ -16,6 +19,11 @@ public class ConvexHullContourFilterTest {
1619
private ContourFilter contourFilter;
1720
private ContourFinder contourFinder;
1821

22+
@Before
23+
public void setup(){
24+
OpenCVManager.getInstance().load(new SystemProperties());
25+
}
26+
1927
@Test
2028
public void testFilterContours(){
2129
contourFinder = new StandardContourFinder();

0 commit comments

Comments
 (0)