Use new locking and publish static versions

This fixes #229.

.circleci/config.yml

@@ -6,7 +6,7 @@ defaults: &defaults
     - checkout
     - restore_cache:
         keys:
-          - v1-gradle-caches-{{ checksum "global.lock" }}
+          - v2-gradle-caches-{{ checksum "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 "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 "gradle/dependency-locks/runtimeClasspath.lockfile" }}
       - run:
           name: Update locks
           command: ./gradlew generateGlobalLock saveGlobalLock stutterWriteLocks
@@ -54,7 +54,7 @@ jobs:
       - persist_to_workspace:
           root: '.'
           paths:
-            - 'global.lock'
+            - 'gradle/dependency-locks'
             - '.stutter/'
             - '*/.stutter/'
             - '*/*/.stutter/'
@@ -77,7 +77,7 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v1-gradle-caches-{{ checksum "global.lock" }}
+            - v2-gradle-caches-{{ checksum "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'

.stutter/java8.lock

@@ -1,24 +1,5 @@
 # DO NOT MODIFY: Generated by Stutter plugin.
 3.0
-3.1
-3.2
-3.2.1
-3.3
-3.4
-3.4.1
-3.5
 3.5.1
 4.0
-4.0.1
-4.0.2
-4.1
-4.2
-4.2.1
-4.3
-4.3.1
-4.4
-4.4.1
-4.5
-4.5.1
-4.6
-4.7
+4.8-rc-3

.stutter/java9.lock

@@ -1,10 +1,3 @@
 # DO NOT MODIFY: Generated by Stutter plugin.
 4.2.1
-4.3
-4.3.1
-4.4
-4.4.1
-4.5
-4.5.1
-4.6
-4.7
+4.8-rc-3

build.gradle

@@ -1,16 +1,14 @@
 plugins {
-  id 'org.ajoberstar.defaults' version '0.11.0'
+  id 'org.ajoberstar.defaults' version '0.12.0-rc.2'
   id 'org.jbake.site' version '1.0.0'
   id 'java-gradle-plugin'
   id 'groovy'
-  // TODO remove when Gradle dependency locking is available
-  id 'nebula.dependency-lock' version '5.0.4'
 }
 
 group = 'org.ajoberstar'
 description = 'The Groovy way to use Git.'
 
-sourceCompatibility = '1.8'
+sourceCompatibility = 8
 
 // compat tests use grgit to set up and verify the tests
 sourceSets {
@@ -56,6 +54,10 @@ configurations.compatTestCompile {
   exclude group: 'org.codehaus.groovy'
 }
 
+dependencyLocking {
+  lockAllConfigurations()
+}
+
 dependencies {
   // groovy
   testCompile 'org.codehaus.groovy:groovy-all:[2.4.0, 3.0.0)'
@@ -80,17 +82,14 @@ dependencies {
   compile 'com.jcraft:jsch:[0.1.54,)'
 
   // logging
-  def slf4jVersion = '[1.7.25,1.8.0-alpha)' // wait for final 1.8.0 to come out before letting it in
-  testCompile "org.slf4j:slf4j-api:${slf4jVersion}"
-  testRuntime "org.slf4j:slf4j-simple:${slf4jVersion}"
+  testCompile "org.slf4j:slf4j-api:[1.7.25,1.8.0-alpha)" // wait for final 1.8.0 to come out before letting it in
+  testRuntime "org.slf4j:slf4j-simple:[1.7.25,1.8.0-alpha)"
 
   // testing
-  def junitVersion = '4.12'
-  testCompile "junit:junit:$junitVersion"
-  compatTestCompile "junit:junit:$junitVersion"
-  def spockVersion = '1.1-groovy-2.4'
-  testCompile "org.spockframework:spock-core:$spockVersion"
-  compatTestCompile "org.spockframework:spock-core:$spockVersion"
+  testCompile "junit:junit:latest.release"
+  compatTestCompile "junit:junit:latest.release"
+  testCompile "org.spockframework:spock-core:1.1-groovy-2.4"
+  compatTestCompile "org.spockframework:spock-core:1.1-groovy-2.4"
 }
 
 test {
@@ -109,16 +108,14 @@ test {
 }
 
 stutter {
+  sparse = true
   includeActiveRc = true
   java(8) {
     compatibleRange '3.0'
   }
   java(9) {
     compatibleRange '4.2.1'
   }
-  java(10) {
-    compatibleRange '4.2.1'
-  }
 }
 
 publishing {