Skip to content

Commit 550cecd

Browse files
Excavator: Update to Gradle 7 (palantir#528)
1 parent 241de0c commit 550cecd

5 files changed

Lines changed: 25 additions & 19 deletions

File tree

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ buildscript {
1111
classpath 'com.palantir.baseline:gradle-baseline-java:4.46.0'
1212
classpath 'gradle.plugin.org.inferred:gradle-processors:3.6.0'
1313
classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.3'
14-
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.2.0'
14+
classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.3.0'
1515
}
1616
}
1717

1818
plugins {
19-
id "org.jetbrains.intellij" version "0.4.13" apply false
20-
id 'org.jetbrains.gradle.plugin.idea-ext' version "0.9"
19+
id "org.jetbrains.intellij" version "1.3.0" apply false
20+
id 'org.jetbrains.gradle.plugin.idea-ext' version "1.1.1"
2121
}
2222

2323
apply plugin: 'com.palantir.external-publish'
Lines changed: 1 addition & 1 deletion
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-6.9-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎palantir-java-format/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ dependencies {
1717
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
1818
implementation 'com.fasterxml.jackson.module:jackson-module-parameter-names'
1919

20-
testCompile 'com.google.guava:guava-testlib'
21-
testCompile 'com.google.truth:truth'
22-
testCompile 'com.google.testing.compile:compile-testing'
20+
testImplementation 'com.google.guava:guava-testlib'
21+
testImplementation 'com.google.truth:truth'
22+
testImplementation 'com.google.testing.compile:compile-testing'
2323
testImplementation 'org.assertj:assertj-core'
2424
testImplementation 'org.junit.jupiter:junit-jupiter-migrationsupport'
2525
testImplementation 'org.junit.jupiter:junit-jupiter'

‎versions.lock‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ com.google.j2objc:j2objc-annotations:1.3 (2 constraints: 9116c510)
2323
com.googlecode.concurrent-trees:concurrent-trees:2.6.1 (1 constraints: 761166da)
2424
com.googlecode.javaewah:JavaEWAH:1.1.7 (1 constraints: 490e7f50)
2525
org.checkerframework:checker-qual:3.13.0 (3 constraints: 14225427)
26-
org.codehaus.groovy:groovy:3.0.9 (1 constraints: 980d8e2a)
26+
org.codehaus.groovy:groovy:3.0.9 (3 constraints: b52813bc)
2727
org.codehaus.groovy:groovy-xml:3.0.9 (1 constraints: 791161da)
2828
org.derive4j:derive4j-annotation:1.1.1 (1 constraints: 0505f435)
2929
org.eclipse.jgit:org.eclipse.jgit:5.10.0.202012080955-r (2 constraints: 462b9822)
@@ -32,27 +32,33 @@ org.immutables:value:2.8.8 (1 constraints: 14051536)
3232
org.slf4j:slf4j-api:1.7.32 (2 constraints: b913c87b)
3333

3434
[Test dependencies]
35-
cglib:cglib-nodep:3.2.2 (1 constraints: 490ded24)
35+
cglib:cglib-nodep:3.3.0 (2 constraints: 7a1acf3c)
3636
com.google.auto.value:auto-value:1.5.3 (1 constraints: 1c121afb)
3737
com.google.auto.value:auto-value-annotations:1.8.1 (1 constraints: 620a29b9)
3838
com.google.guava:guava-testlib:27.0.1-jre (1 constraints: aa067c53)
3939
com.google.testing.compile:compile-testing:0.15 (1 constraints: da04f230)
4040
com.google.truth:truth:1.1.3 (3 constraints: b72b7cb8)
4141
com.google.truth.extensions:truth-java8-extension:0.37 (1 constraints: ef11ffe8)
42-
com.netflix.nebula:nebula-test:9.0.0 (1 constraints: 0b051836)
43-
junit:junit:4.13.2 (7 constraints: c361d3ed)
44-
org.assertj:assertj-core:3.21.0 (1 constraints: 38053c3b)
42+
com.netflix.nebula:nebula-test:10.0.0 (1 constraints: 3305273b)
43+
junit:junit:4.13.2 (7 constraints: 796291b5)
44+
net.bytebuddy:byte-buddy:1.10.16 (1 constraints: 950dfa39)
45+
org.assertj:assertj-core:3.21.0 (2 constraints: 64171047)
46+
org.hamcrest:hamcrest:2.2 (1 constraints: d20cdc04)
4547
org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)
46-
org.junit:junit-bom:5.8.2 (8 constraints: f587147e)
48+
org.jetbrains:annotations:19.0.0 (1 constraints: 660d8f2c)
49+
org.junit:junit-bom:5.8.2 (12 constraints: 6ac77fbf)
4750
org.junit.jupiter:junit-jupiter:5.8.2 (2 constraints: 260e7a59)
4851
org.junit.jupiter:junit-jupiter-api:5.8.2 (5 constraints: aa4de77d)
4952
org.junit.jupiter:junit-jupiter-engine:5.8.2 (2 constraints: 2117d23c)
5053
org.junit.jupiter:junit-jupiter-migrationsupport:5.8.2 (2 constraints: 260e7a59)
5154
org.junit.jupiter:junit-jupiter-params:5.8.2 (2 constraints: 2117d23c)
5255
org.junit.platform:junit-platform-commons:1.8.2 (3 constraints: ee29ed2b)
53-
org.junit.platform:junit-platform-engine:1.8.2 (3 constraints: 3c2ac55d)
56+
org.junit.platform:junit-platform-engine:1.8.2 (4 constraints: 863c7bdc)
57+
org.junit.platform:junit-platform-launcher:1.8.2 (2 constraints: 121b944a)
58+
org.junit.platform:junit-platform-testkit:1.8.2 (1 constraints: 12097995)
5459
org.junit.vintage:junit-vintage-engine:5.8.2 (2 constraints: 260e7a59)
55-
org.objenesis:objenesis:2.4 (1 constraints: ea0c8c0a)
56-
org.opentest4j:opentest4j:1.2.0 (2 constraints: cd205b49)
57-
org.ow2.asm:asm:9.1 (1 constraints: 040aa7a4)
58-
org.spockframework:spock-core:1.3-groovy-2.4 (1 constraints: 7c10f3af)
60+
org.objenesis:objenesis:3.1 (2 constraints: bb193de0)
61+
org.opentest4j:opentest4j:1.2.0 (3 constraints: c53224a1)
62+
org.ow2.asm:asm:9.1 (2 constraints: da162012)
63+
org.spockframework:spock-core:2.0-M4-groovy-3.0 (2 constraints: e822d65a)
64+
org.spockframework:spock-junit4:2.0-M4-groovy-3.0 (1 constraints: 25115ddf)

‎versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ com.google.guava:guava-testlib = 27.0.1-jre
88
com.google.testing.compile:compile-testing = 0.15
99
com.google.truth:truth = 1.1.3
1010
com.palantir.sls.versions:sls-versions = 1.2.0
11-
com.netflix.nebula:nebula-test = 9.0.0
11+
com.netflix.nebula:nebula-test = 10.0.0
1212
junit:junit = 4.13.2
1313
org.assertj:assertj-core = 3.21.0
1414
org.derive4j:* = 1.1.1

0 commit comments

Comments
 (0)