Publish static versions

And use new locking.

.circleci/config.yml

@@ -6,7 +6,7 @@ defaults: &defaults
     - checkout
     - restore_cache:
         keys:
-          - v1-gradle-caches-{{ checksum "global.lock" }}
+          - v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }}
     - attach_workspace:
         at: '.'
     - run:
@@ -15,7 +15,7 @@ defaults: &defaults
     - save_cache:
         paths:
           - '~/.gradle/caches'
-        key: v1-gradle-caches-{{ checksum "global.lock" }}
+        key: v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }}
     - store_test_results:
         path: '~/gradle-test-results'
         when: always
@@ -44,7 +44,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-gradle-caches-{{ checksum "global.lock" }}
+            - v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }}
       - run:
           name: Update locks
           command: ./gradlew generateGlobalLock saveGlobalLock stutterWriteLocks
@@ -54,7 +54,9 @@ jobs:
       - persist_to_workspace:
           root: '.'
           paths:
-            - 'global.lock'
+            - 'gradle/dependency-locks/'
+            - '*/gradle/dependency-locks/'
+            - '*/*/gradle/dependency-locks/'
             - '.stutter/'
             - '*/.stutter/'
             - '*/*/.stutter/'
@@ -77,7 +79,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-gradle-caches-{{ checksum "global.lock" }}
+            - v2-gradle-caches-{{ checksum "reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile" }}-{{ checksum "reckon-gradle/gradle/dependency-locks/runtimeClasspath.lockfile" }}
       - run:
           name: Decrypt Gradle properties
           command: openssl enc -d -aes256 -base64 -in gradle.properties.enc -out gradle.properties -pass 'pass:$GRADLE_PROPS_KEY'

build.gradle

@@ -1,15 +1,27 @@
 plugins {
-    id 'org.ajoberstar.defaults' version '0.11.0'
-    // TODO remove when Gradle dependency locking is available
-    id 'nebula.dependency-lock' version '5.0.4' apply false
+    id 'org.ajoberstar.defaults' version '0.12.0-rc.2'
 }
 
 allprojects {
-  // TODO remove when Gradle dependency locking is available
-  apply plugin: 'nebula.dependency-lock'
-
   group = 'org.ajoberstar.reckon'
 
+  dependencyLocking {
+    lockAllConfigurations()
+  }
+
+  task lock {
+    doFirst {
+      assert gradle.startParameter.writeDependencyLocks
+    }
+    doLast {
+      configurations.each {
+        if (it.canBeResolved) {
+          it.resolve()
+        }
+      }
+    }
+  }
+
   plugins.withId('maven-publish') {
     publishing {
       repositories {
@@ -28,4 +40,4 @@ allprojects {
 }
 
 ext.grgitVersion = '[2.0.0,)'
-ext.jgitVersion = '[4.8.0,)'
+ext.jgitVersion = '[4.11.0,5.0)'

gradle/dependency-locks/archives.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

gradle/dependency-locks/default.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

reckon-core/build.gradle

@@ -2,17 +2,16 @@ plugins {
   id 'groovy'
 }
 
-sourceCompatibility = '1.8'
+sourceCompatibility = 8
 
 repositories {
   jcenter()
 }
 
 dependencies {
   // logging
-  def slf4jVersion = '[1.7.25,1.8.0-alpha]' // wait until final 1.8.0 is out to upgrade
-  compile "org.slf4j:slf4j-api:$slf4jVersion"
-  testRuntime "org.slf4j:slf4j-simple:$slf4jVersion"
+  compile 'org.slf4j:slf4j-api:[1.7.25,1.8.0-alpha)' // wait until final 1.8.0 is out to upgrade
+  testRuntime 'org.slf4j:slf4j-simple:[1.7.25,1.8.0-alpha)'
 
   // git
   compile "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"

reckon-core/gradle/dependency-locks/annotationProcessor.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

reckon-core/gradle/dependency-locks/archives.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

reckon-core/gradle/dependency-locks/compile.lockfile

@@ -0,0 +1,14 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.zafarkhaja:java-semver:0.9.0
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch:0.1.54
+com.jcraft:jzlib:1.1.1
+commons-codec:commons-codec:1.9
+commons-logging:commons-logging:1.2
+org.apache.commons:commons-lang3:3.7
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.4
+org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
+org.slf4j:slf4j-api:1.7.25

reckon-core/gradle/dependency-locks/compileClasspath.lockfile

@@ -0,0 +1,14 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.zafarkhaja:java-semver:0.9.0
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch:0.1.54
+com.jcraft:jzlib:1.1.1
+commons-codec:commons-codec:1.9
+commons-logging:commons-logging:1.2
+org.apache.commons:commons-lang3:3.7
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.4
+org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
+org.slf4j:slf4j-api:1.7.25

reckon-core/gradle/dependency-locks/compileOnly.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

reckon-core/gradle/dependency-locks/default.lockfile

@@ -0,0 +1,14 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.zafarkhaja:java-semver:0.9.0
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch:0.1.54
+com.jcraft:jzlib:1.1.1
+commons-codec:commons-codec:1.9
+commons-logging:commons-logging:1.2
+org.apache.commons:commons-lang3:3.7
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.4
+org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
+org.slf4j:slf4j-api:1.7.25

reckon-core/gradle/dependency-locks/runtime.lockfile

@@ -0,0 +1,14 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.zafarkhaja:java-semver:0.9.0
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch:0.1.54
+com.jcraft:jzlib:1.1.1
+commons-codec:commons-codec:1.9
+commons-logging:commons-logging:1.2
+org.apache.commons:commons-lang3:3.7
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.4
+org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
+org.slf4j:slf4j-api:1.7.25

reckon-core/gradle/dependency-locks/runtimeClasspath.lockfile

@@ -0,0 +1,14 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.zafarkhaja:java-semver:0.9.0
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch:0.1.54
+com.jcraft:jzlib:1.1.1
+commons-codec:commons-codec:1.9
+commons-logging:commons-logging:1.2
+org.apache.commons:commons-lang3:3.7
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.4
+org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
+org.slf4j:slf4j-api:1.7.25

reckon-core/gradle/dependency-locks/testAnnotationProcessor.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.

reckon-core/gradle/dependency-locks/testCompile.lockfile

@@ -0,0 +1,28 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.zafarkhaja:java-semver:0.9.0
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch.agentproxy.core:0.0.9
+com.jcraft:jsch.agentproxy.jsch:0.0.9
+com.jcraft:jsch.agentproxy.pageant:0.0.9
+com.jcraft:jsch.agentproxy.sshagent:0.0.9
+com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
+com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
+com.jcraft:jsch:0.1.54
+com.jcraft:jzlib:1.1.1
+commons-codec:commons-codec:1.9
+commons-logging:commons-logging:1.2
+junit:junit:4.12
+net.java.dev.jna:jna-platform:4.1.0
+net.java.dev.jna:jna:4.1.0
+org.ajoberstar:grgit:2.2.1-rc.4
+org.apache.commons:commons-lang3:3.7
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.4
+org.codehaus.groovy:groovy-all:2.4.15
+org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
+org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
+org.hamcrest:hamcrest-core:1.3
+org.slf4j:slf4j-api:1.7.25
+org.spockframework:spock-core:1.1-groovy-2.4

reckon-core/gradle/dependency-locks/testCompileClasspath.lockfile

@@ -0,0 +1,28 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.
+com.github.zafarkhaja:java-semver:0.9.0
+com.googlecode.javaewah:JavaEWAH:1.1.6
+com.jcraft:jsch.agentproxy.core:0.0.9
+com.jcraft:jsch.agentproxy.jsch:0.0.9
+com.jcraft:jsch.agentproxy.pageant:0.0.9
+com.jcraft:jsch.agentproxy.sshagent:0.0.9
+com.jcraft:jsch.agentproxy.usocket-jna:0.0.9
+com.jcraft:jsch.agentproxy.usocket-nc:0.0.9
+com.jcraft:jsch:0.1.54
+com.jcraft:jzlib:1.1.1
+commons-codec:commons-codec:1.9
+commons-logging:commons-logging:1.2
+junit:junit:4.12
+net.java.dev.jna:jna-platform:4.1.0
+net.java.dev.jna:jna:4.1.0
+org.ajoberstar:grgit:2.2.1-rc.4
+org.apache.commons:commons-lang3:3.7
+org.apache.httpcomponents:httpclient:4.5.2
+org.apache.httpcomponents:httpcore:4.4.4
+org.codehaus.groovy:groovy-all:2.4.15
+org.eclipse.jgit:org.eclipse.jgit.ui:4.11.0.201803080745-r
+org.eclipse.jgit:org.eclipse.jgit:4.11.0.201803080745-r
+org.hamcrest:hamcrest-core:1.3
+org.slf4j:slf4j-api:1.7.25
+org.spockframework:spock-core:1.1-groovy-2.4

reckon-core/gradle/dependency-locks/testCompileOnly.lockfile

@@ -0,0 +1,3 @@
+# This is a Gradle generated file for dependency locking.
+# Manual edits can break the build and are not advised.
+# This file is expected to be part of source control.