Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FLW-4160] Update dependencies #31

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[FLW-4160] Update dependencies #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 5 additions & 4 deletions jazon-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ ext {
apply from: '../gradle/publishing.gradle'

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

compileOnly 'org.projectlombok:lombok:1.18.12'
annotationProcessor 'org.projectlombok:lombok:1.18.12'
compileOnly 'org.projectlombok:lombok:1.18.32'
annotationProcessor 'org.projectlombok:lombok:1.18.32'

testCompile group: 'org.spockframework', name: 'spock-core', version: '1.2-groovy-2.4'
testImplementation 'org.spockframework:spock-core:2.4-M4-groovy-4.0'
}
23 changes: 14 additions & 9 deletions jazon-core/src/test/groovy/com/zendesk/jazon/MatcherSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,17 +489,22 @@ class MatcherSpec extends Specification {
match([a: anyNumberOf(expected)], [a: actual]).success()

where:
expected | actual
'1' | []
'1' | ['1']
'1' | ['1', '1']
true | [true]
2 | [2]
[b: true, c: 1] | [[[b: true, c: 1]]]
[3, 4, 5] | [[3, 4, 5]]
{ it -> it > 5 } as Predicate<Integer> | [6, 7, 8]
[expected, actual] << () -> {
return [
['1', []],
['1', ['1']],
['1', ['1', '1']],
[true, [true]],
[2, [2]],
[[b: true, c: 1], [[[b: true, c: 1]]]],
[[3, 4, 5], [[[3, 4, 5]]]],
[{ it -> it > 5 } as Predicate<Integer>, [6, 7, 8]]
]
}
}



@Unroll
def "array each element expectation - element mismatch"() {
when:
Expand Down
2 changes: 1 addition & 1 deletion jazon-core/src/test/groovy/com/zendesk/jazon/MismatchPathSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.zendesk.jazon.expectation.translator.TranslatorFacade
import com.zendesk.jazon.mismatch.impl.PrimitiveValueMismatch
import spock.lang.Specification

import static groovy.json.JsonOutput.toJson
import static groovy.json.JsonOutput.toJson;

class MismatchPathSpec extends Specification {
private static final TestActualFactory testActualFactory = new TestActualFactory()
Expand Down
8 changes: 4 additions & 4 deletions jazon-junit/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ ext {
apply from: '../gradle/publishing.gradle'

dependencies {
compile project(':jazon-core')
implementation project(':jazon-core')

compileOnly 'org.projectlombok:lombok:1.18.12'
annotationProcessor 'org.projectlombok:lombok:1.18.12'
compileOnly 'org.projectlombok:lombok:1.18.32'
annotationProcessor 'org.projectlombok:lombok:1.18.32'

testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0-M2'
}
8 changes: 4 additions & 4 deletions jazon-spock/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ ext {
apply from: '../gradle/publishing.gradle'

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

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