Skip to content

Commit ede7010

Browse files
committed
Update dependencies
1 parent dc1ff78 commit ede7010

File tree

7 files changed

+31
-24
lines changed

7 files changed

+31
-24
lines changed

build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ allprojects {
55
subprojects {
66
apply plugin: 'groovy'
77

8-
sourceCompatibility = 1.8
8+
sourceCompatibility = '17'
9+
targetCompatibility = '17'
910

1011
repositories {
1112
jcenter()
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

jazon-core/build.gradle

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ ext {
66
apply from: '../gradle/publishing.gradle'
77

88
dependencies {
9-
compile group: 'com.google.code.gson', name: 'gson', version: '2.9.1'
9+
compileOnly 'com.google.code.gson:gson:2.11.0'
10+
implementation 'org.apache.groovy:groovy-json:4.0.21'
1011

11-
compileOnly 'org.projectlombok:lombok:1.18.12'
12-
annotationProcessor 'org.projectlombok:lombok:1.18.12'
12+
compileOnly 'org.projectlombok:lombok:1.18.32'
13+
annotationProcessor 'org.projectlombok:lombok:1.18.32'
1314

14-
testCompile group: 'org.spockframework', name: 'spock-core', version: '1.2-groovy-2.4'
15+
testImplementation 'org.spockframework:spock-core:2.4-M4-groovy-4.0'
1516
}

jazon-core/src/test/groovy/com/zendesk/jazon/MatcherSpec.groovy

+14-9
Original file line numberDiff line numberDiff line change
@@ -489,17 +489,22 @@ class MatcherSpec extends Specification {
489489
match([a: anyNumberOf(expected)], [a: actual]).success()
490490
491491
where:
492-
expected | actual
493-
'1' | []
494-
'1' | ['1']
495-
'1' | ['1', '1']
496-
true | [true]
497-
2 | [2]
498-
[b: true, c: 1] | [[[b: true, c: 1]]]
499-
[3, 4, 5] | [[3, 4, 5]]
500-
{ it -> it > 5 } as Predicate<Integer> | [6, 7, 8]
492+
[expected, actual] << () -> {
493+
return [
494+
['1', []],
495+
['1', ['1']],
496+
['1', ['1', '1']],
497+
[true, [true]],
498+
[2, [2]],
499+
[[b: true, c: 1], [[[b: true, c: 1]]]],
500+
[[3, 4, 5], [[[3, 4, 5]]]],
501+
[{ it -> it > 5 } as Predicate<Integer>, [6, 7, 8]]
502+
]
503+
}
501504
}
502505
506+
507+
503508
@Unroll
504509
def "array each element expectation - element mismatch"() {
505510
when:

jazon-core/src/test/groovy/com/zendesk/jazon/MismatchPathSpec.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.zendesk.jazon.expectation.translator.TranslatorFacade
77
import com.zendesk.jazon.mismatch.impl.PrimitiveValueMismatch
88
import spock.lang.Specification
99

10-
import static groovy.json.JsonOutput.toJson
10+
import static groovy.json.JsonOutput.toJson;
1111

1212
class MismatchPathSpec extends Specification {
1313
private static final TestActualFactory testActualFactory = new TestActualFactory()

jazon-junit/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ext {
66
apply from: '../gradle/publishing.gradle'
77

88
dependencies {
9-
compile project(':jazon-core')
9+
implementation project(':jazon-core')
1010

11-
compileOnly 'org.projectlombok:lombok:1.18.12'
12-
annotationProcessor 'org.projectlombok:lombok:1.18.12'
11+
compileOnly 'org.projectlombok:lombok:1.18.32'
12+
annotationProcessor 'org.projectlombok:lombok:1.18.32'
1313

14-
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.1'
14+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0-M2'
1515
}

jazon-spock/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ ext {
66
apply from: '../gradle/publishing.gradle'
77

88
dependencies {
9-
compile project(':jazon-core')
10-
compile group: 'org.codehaus.groovy', name: 'groovy-all', version: '2.4.12'
9+
implementation project(':jazon-core')
10+
implementation 'org.apache.groovy:groovy-all:4.0.21'
1111

12-
testCompile group: 'org.spockframework', name: 'spock-core', version: '1.2-groovy-2.4'
13-
}
12+
testImplementation 'org.spockframework:spock-core:2.4-M4-groovy-4.0'
13+
}

0 commit comments

Comments
 (0)