Excavator: gradle-consistent-versions (#241)

.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
       - restore_cache:
           key: gradle-cache-{{ checksum "versions.props" }}-{{ checksum "build.gradle" }}
 
-      - run: ./gradlew --parallel resolveConfigurations
+      - run: ./gradlew --parallel classes testClasses
 
       - save_cache:
           key: gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}

build.gradle

@@ -25,6 +25,7 @@ buildscript {
     }
 
     dependencies {
+        classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:1.15.0'
         classpath 'com.netflix.nebula:gradle-info-plugin:5.2.0'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:14.1.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
@@ -35,6 +36,7 @@ buildscript {
     }
 }
 
+apply plugin: 'com.palantir.consistent-versions'
 apply plugin: 'com.palantir.baseline'
 apply plugin: 'com.palantir.git-version'
 
@@ -48,12 +50,6 @@ allprojects {
             url 'https://dl.bintray.com/palantir/releases/'
         }
     }
-
-    configurations.all {
-        resolutionStrategy {
-            failOnVersionConflict()
-        }
-    }
 }
 
 import net.ltgt.gradle.errorprone.CheckSeverity;

conjure-python-verifier/build.gradle

@@ -71,14 +71,14 @@ task generate() {
 
 task checkPipFile() {
     doLast {
-        def clientVersion = dependencyRecommendations.getRecommendedVersion('com.palantir.conjure.python', 'conjure-python-client')
+        def clientVersion = conjurePythonClientVersion
         assert file("python/Pipfile").text.contains("conjure-python-client = \"==${clientVersion}\"")
     }
 }
 
 task checkToxIni() {
     doLast {
-        def clientVersion = dependencyRecommendations.getRecommendedVersion('com.palantir.conjure.python', 'conjure-python-client')
+        def clientVersion = conjurePythonClientVersion
         assert file("python/tox.ini").text.contains("CONJURE_PYTHON_CLIENT_VERSION = ${clientVersion}")
     }
 }

conjure-python/build.gradle

@@ -30,9 +30,9 @@ dependencies {
     compileOnly 'org.immutables:value::annotations'
 }
 
-task generateBuildConfiguration() {
+task generateBuildConfiguration {
     doLast {
-        def minConjureClientVersion = dependencyRecommendations.getRecommendedVersion('com.palantir.conjure.python', 'conjure-python-client')
+        def minConjureClientVersion = conjurePythonClientVersion
         def props = new File("$projectDir/src/main/resources/buildConfiguration.yml")
         props.getParentFile().mkdirs()
         props.text = "generatorVersion: ${project.version}\n"

gradle.properties

@@ -1 +1,3 @@
 org.gradle.parallel=true
+com.palantir.baseline-versions.disable=true
+conjurePythonClientVersion=1.4.0

settings.gradle

@@ -1,4 +1,4 @@
-rootProject.name = 'conjure-python'
+rootProject.name = 'conjure-python-root'
 
 include 'conjure-python'
 include 'conjure-python-core'

versions.lock

@@ -0,0 +1,50 @@
+# Run ./gradlew --write-locks to regenerate this file
+com.fasterxml.jackson.core:jackson-annotations:2.9.8 (3 constraints: cd3422d7)
+com.fasterxml.jackson.core:jackson-core:2.9.8 (3 constraints: e33f63d8)
+com.fasterxml.jackson.core:jackson-databind:2.9.8 (7 constraints: 3e687505)
+com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.8 (2 constraints: af134163)
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8 (3 constraints: 8c212aae)
+com.google.code.findbugs:jsr305:3.0.2 (3 constraints: bb1e03b7)
+com.google.errorprone:error_prone_annotations:2.3.4 (4 constraints: b32e32ac)
+com.google.guava:guava:23.6.1-jre (4 constraints: c63ea41d)
+com.google.j2objc:j2objc-annotations:1.1 (1 constraints: b609eba0)
+com.palantir.conjure:conjure-api-objects:4.4.0 (2 constraints: f7212ba8)
+com.palantir.conjure:conjure-generator-common:4.4.0 (2 constraints: 9b135b61)
+com.palantir.conjure.java:conjure-lib:2.4.0 (1 constraints: 3811acd3)
+com.palantir.conjure.java.api:errors:2.0.0 (1 constraints: ea0f6a99)
+com.palantir.ri:resource-identifier:1.0.1 (1 constraints: ea0f6699)
+com.palantir.safe-logging:preconditions:1.5.0 (1 constraints: 990fcf86)
+com.palantir.safe-logging:safe-logging:1.5.0 (2 constraints: 9a20b233)
+com.palantir.tokens:auth-tokens:3.0.1 (1 constraints: ec0f7099)
+info.picocli:picocli:3.7.0 (1 constraints: 0c050f36)
+javax.ws.rs:javax.ws.rs-api:2.0.1 (2 constraints: 8320dc35)
+org.apache.commons:commons-lang3:3.9 (2 constraints: 5e177220)
+org.checkerframework:checker-compat-qual:2.0.0 (1 constraints: 140ae5b4)
+org.codehaus.mojo:animal-sniffer-annotations:1.14 (1 constraints: ea09d5aa)
+org.immutables:value:2.7.5 (1 constraints: 10050f36)
+org.slf4j:slf4j-api:1.7.25 (5 constraints: 643b923c)
+org.slf4j:slf4j-simple:1.7.25 (1 constraints: 4105483b)
+org.yaml:snakeyaml:1.23 (1 constraints: 6e17f627)
+
+[Test dependencies]
+com.palantir.conjure:conjure-core:4.4.0 (1 constraints: 0a050b36)
+com.palantir.syntactic-paths:syntactic-paths:0.6.1 (1 constraints: 910eba57)
+io.dropwizard.metrics:metrics-core:3.2.5 (1 constraints: 940ec157)
+javax.annotation:javax.annotation-api:1.2 (1 constraints: 90103ea1)
+javax.inject:javax.inject:1 (2 constraints: d614a0ab)
+junit:junit:4.12 (1 constraints: db04ff30)
+net.bytebuddy:byte-buddy:1.9.10 (1 constraints: 450b52de)
+net.bytebuddy:byte-buddy-agent:1.9.10 (1 constraints: 450b52de)
+org.assertj:assertj-core:3.12.2 (1 constraints: 3a053d3b)
+org.glassfish.hk2:hk2-api:2.5.0-b32 (2 constraints: 451f3a01)
+org.glassfish.hk2:hk2-locator:2.5.0-b32 (1 constraints: e6114109)
+org.glassfish.hk2:hk2-utils:2.5.0-b32 (2 constraints: 0519152b)
+org.glassfish.hk2:osgi-resource-locator:1.0.1 (1 constraints: ed10e5c2)
+org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b32 (2 constraints: 0519152b)
+org.glassfish.hk2.external:javax.inject:2.5.0-b32 (2 constraints: 451f3a01)
+org.glassfish.jersey.bundles.repackaged:jersey-guava:2.25.1 (1 constraints: 251120d4)
+org.glassfish.jersey.core:jersey-common:2.25.1 (1 constraints: c40e8766)
+org.hamcrest:hamcrest-core:1.3 (1 constraints: cc05fe3f)
+org.javassist:javassist:3.20.0-GA (1 constraints: 4f0d1a40)
+org.mockito:mockito-core:3.0.0 (1 constraints: 0505fa35)
+org.objenesis:objenesis:2.6 (1 constraints: b40a14bd)

versions.props

@@ -15,7 +15,3 @@ org.mockito:mockito-core = 3.0.0
 org.slf4j:* = 1.7.25
 
 # linter:OFF
-com.palantir.conjure.python:conjure-python-client = 1.4.0
-
-# conflict resolution
-org.checkerframework:checker-qual = 3.0.0