Skip to content
This repository was archived by the owner on Sep 19, 2024. It is now read-only.

Commit 7a3dacb

Browse files
Excavator: Upgrade gradle wrapper to the latest version (#575)
1 parent b563053 commit 7a3dacb

File tree

5 files changed

+20
-26
lines changed

5 files changed

+20
-26
lines changed

gradle/wrapper/gradle-wrapper.jar

868 Bytes
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
4+
networkTimeout=10000
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists

gradlew

Lines changed: 8 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/groovy/com/palantir/gradle/revapi/RevapiSpec.groovy

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class RevapiSpec extends IntegrationSpec {
2626
private Git git
2727

2828
def setup() {
29+
//System.setProperty("ignoreDeprecations", "true")
2930
git = new Git(projectDir)
3031
}
3132

@@ -269,7 +270,7 @@ class RevapiSpec extends IntegrationSpec {
269270

270271
buildFile << """
271272
plugins {
272-
id 'com.palantir.git-version' version '0.12.2'
273+
id 'com.palantir.git-version' version '3.1.0'
273274
}
274275
275276
apply plugin: '${TestConstants.PLUGIN_NAME}'
@@ -732,7 +733,7 @@ class RevapiSpec extends IntegrationSpec {
732733
}
733734
734735
dependencies {
735-
classpath 'com.palantir.baseline:gradle-baseline-java:4.1.0'
736+
classpath 'com.palantir.baseline:gradle-baseline-java:5.66.0'
736737
}
737738
}
738739
@@ -991,7 +992,7 @@ class RevapiSpec extends IntegrationSpec {
991992
}
992993
993994
dependencies {
994-
classpath 'com.palantir.gradle.conjure:gradle-conjure:4.13.3'
995+
classpath 'com.palantir.gradle.conjure:gradle-conjure:5.51.0'
995996
}
996997
}
997998
@@ -1007,21 +1008,21 @@ class RevapiSpec extends IntegrationSpec {
10071008
apply plugin: 'com.palantir.conjure'
10081009
10091010
dependencies {
1010-
conjureCompiler 'com.palantir.conjure:conjure:4.6.2'
1011-
conjureJava 'com.palantir.conjure.java:conjure-java:4.5.0'
1011+
conjureCompiler 'com.palantir.conjure:conjure:4.49.0'
1012+
conjureJava 'com.palantir.conjure.java:conjure-java:8.28.0'
10121013
}
10131014
10141015
subprojects {
1016+
apply plugin: 'java-library'
10151017
apply plugin: '${TestConstants.PLUGIN_NAME}'
10161018
10171019
revapi {
10181020
oldVersion = project.version
10191021
}
10201022
10211023
dependencies {
1022-
api 'com.palantir.conjure.java:conjure-lib:4.5.0'
1023-
api 'com.palantir.conjure.java:conjure-undertow-lib:4.5.0'
1024-
api 'com.squareup.retrofit2:retrofit:2.6.2'
1024+
api 'com.palantir.conjure.java:conjure-lib:8.28.0'
1025+
api 'com.palantir.conjure.java:conjure-undertow-lib:8.28.0'
10251026
}
10261027
10271028
apply plugin: 'maven-publish'
@@ -1033,7 +1034,6 @@ class RevapiSpec extends IntegrationSpec {
10331034
10341035
addSubproject('api-objects')
10351036
addSubproject('api-jersey')
1036-
addSubproject('api-retrofit')
10371037
addSubproject('api-undertow')
10381038
10391039
def conjureYml = 'src/main/conjure/conjure.yml'
@@ -1093,18 +1093,6 @@ class RevapiSpec extends IntegrationSpec {
10931093
assert !jerseyJunit.contains('services.TestService::renamedToSomethingElse()')
10941094
assert !jerseyJunit.contains('java.annotation.attributeValueChanged')
10951095
1096-
runTasksWithFailure(':api-retrofit:revapi')
1097-
def retrofitJunit = new File(projectDir, 'api-retrofit/build/junit-reports/revapi/revapi-api-retrofit.xml').text
1098-
1099-
assert retrofitJunit.contains('java.class.removed-interface services.RenamedServiceRetrofit')
1100-
assert retrofitJunit.contains('java.method.removed-method retrofit2.Call&lt;java.lang.Void&gt; services.TestServiceRetrofit::renamed()')
1101-
assert retrofitJunit.contains('java.method.parameterTypeChanged-parameter retrofit2.Call&lt;java.lang.Void&gt; services.TestServiceRetrofit::swappedArgs(===java.lang.String===, boolean)')
1102-
assert retrofitJunit.contains('java.method.parameterTypeChanged-parameter retrofit2.Call&lt;java.lang.Void&gt; services.TestServiceRetrofit::swappedArgs(java.lang.String, ===boolean===)')
1103-
assert !retrofitJunit.contains('services.TestServiceRetrofit::added()')
1104-
assert !retrofitJunit.contains('services.TestServiceRetrofit::renamedToSomethingElse()')
1105-
assert !retrofitJunit.contains('java.annotation.attributeValueChanged')
1106-
1107-
runTasksSuccessfully(':api-undertow:revapi')
11081096
}
11091097
11101098
static class MethodChange {

0 commit comments

Comments
 (0)