Skip to content

Commit 38779a5

Browse files
author
danf
committed
Update Groovy version -> 2.4.1
1 parent 8d20dad commit 38779a5

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ subprojects() {
153153
project(':bintray-client-java-service') {
154154
dependencies {
155155
compile project(':bintray-client-java-api')
156-
compile 'org.codehaus.groovy:groovy:1.8.0'
157156
compile 'commons-lang:commons-lang:2.6'
157+
testCompile 'org.codehaus.groovy:groovy-all:2.4.1'
158158
testCompile group: 'com.timgroup', name: 'jgravatar', version: '1.0'
159-
testCompile("org.spockframework:spock-core:0.7-groovy-1.8") {
159+
testCompile("org.spockframework:spock-core:1.0-groovy-2.4") {
160160
exclude module: 'groovy-all'
161161
}
162162
}

impl/src/test/groovy/com/jfrog/bintray/client/test/BintraySpecSuite.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ class BintraySpecSuite {
6565
new Attribute<String>('b', 'b', 'e'),
6666
new Attribute<String>('c', 'cee')]
6767

68-
public static String expectedAttributes = '[[values:[ay1, ay2], name:a, type:string], ' +
69-
'[values:[cee], name:c, type:string], [values:[e, b], name:b, type:string]]'
68+
public
69+
static String expectedPkgAttributes = '[[name:c, type:string, values:[cee]], [name:a, type:string, values:[ay1, ay2]], [name:b, type:string, values:[e, b]]]'
70+
public
71+
static String expectedVerAttributes = '[[name:a, type:string, values:[ay1, ay2]], [name:c, type:string, values:[cee]], [name:b, type:string, values:[e, b]]]'
7072

7173
public
7274
static String assortedAttributes = "[{\"name\":\"verAttr2\",\"values\":[\"val1\",\"val2\"],\"type\":\"string\"}," +

impl/src/test/groovy/com/jfrog/bintray/client/test/spec/PackageSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class PackageSpec extends Specification {
9090
then:
9191
['a', 'b', 'c'] == actualPackage.attribute_names.sort()
9292
and:
93-
expectedAttributes.equalsIgnoreCase(actualAttributes.sort().toString())
93+
expectedPkgAttributes.equalsIgnoreCase(actualAttributes.toString())
9494
}
9595

9696
def 'wrong package gives 404'() {

impl/src/test/groovy/com/jfrog/bintray/client/test/spec/VersionSpec.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class VersionSpec extends Specification {
8686
then:
8787
['a', 'b', 'c'] == actualVersion.attribute_names.sort()
8888
and:
89-
expectedAttributes == actualAttributes.sort().toString()
89+
expectedVerAttributes.equalsIgnoreCase(actualAttributes.sort().toString())
9090

9191
}
9292

0 commit comments

Comments
 (0)