Skip to content

Commit

Permalink
Updated used gradle version to 3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Nikolay Nachev authored and pkleimann committed Feb 10, 2017
1 parent 8bdb620 commit 7d02a19
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 20 deletions.
3 changes: 1 addition & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
org.gradle.daemon=true
LIVINGDOC_VERSION = 1.4-SNAPSHOT
LIVINGDOC_GRADLE_VERSION = 1.4-SNAPSHOT
LIVINGDOC_GRADLE_VERSION = 1.4-SNAPSHOT
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Jun 10 11:22:14 CEST 2016
#Fri Jan 20 14:30:50 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
20 changes: 14 additions & 6 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,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 "$@")

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
# 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
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
6 changes: 0 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ goto fail
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
Expand All @@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line
Expand Down
17 changes: 15 additions & 2 deletions livingdoc-gradle.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ repositories {
configurations.all {
transitive = false
}


test {
useTestNG()
}

dependencies {
compile gradleApi()
compile localGroovy()
Expand All @@ -32,4 +36,13 @@ dependencies {
testCompile('org.spockframework:spock-core:1.0-groovy-2.4') {
exclude module: 'groovy-all'
}
}
}

afterEvaluate {
tasks.withType(org.gradle.api.tasks.compile.GroovyCompile) {
options.compilerArgs = [
"-Xbootclasspath/p:" + configurations.compile.asPath
]
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package info.novatec.testit.livingdoc.plugins

import spock.lang.*
import org.gradle.api.*
import org.gradle.api.plugins.*
import org.gradle.testfixtures.ProjectBuilder

/**
Expand Down Expand Up @@ -46,7 +45,7 @@ class LivingDocPluginTest extends Specification {
then:
project.sourceSets.size() == 5
project.tasks.findAll {
it.name.startsWith(project.LIVINGDOC_SOURCESET_NAME) && !it.name.startsWith('freeze')
it.name.startsWith(project.LIVINGDOC_SOURCESET_NAME) && !it.name.startsWith('freeze')
}.size() == 3
project.sourceSets.findAll { it.name.startsWith(project.LIVINGDOC_SOURCESET_NAME) }.size() == 3
}
Expand Down

0 comments on commit 7d02a19

Please sign in to comment.