Merge remote-tracking branch 'Vampire/issue-381' into updates

README.md

@@ -65,18 +65,15 @@ plugins {
   id 'org.ajoberstar.grgit.service' version '<version>'
 }
 
-tasks.register("describe", DescribeTask) {
-  service = grgitService.service
-}
+tasks.register("describe", DescribeTask, grgitService.service)
 
 class DescribeTask extends DefaultTask {
-    @Input
-    final Property<GrgitService> service
+    private final Provider<GrgitService> service
 
     @Inject
-    DoStuffTask(ObjectFactory objectFactory) {
-        this.service = objectFactory.property(GrgitService.class);
-        usesService(this.service);
+    DescribeTask(Provider<GrgitService> service) {
+        this.service = service
+        usesService(service)
     }
 
     @TaskAction

grgit-core/src/test/groovy/org/ajoberstar/grgit/operation/LogOpSpec.groovy

@@ -47,7 +47,7 @@ class LogOpSpec extends SimpleGitOpSpec {
 
   def 'log with no arguments returns all commits'() {
     expect:
-    grgit.log() == [5, 4, 3, 1, 2, 0].collect(intToCommit)
+    grgit.log() in [[5, 4, 3, 2, 1, 0], [5, 4, 3, 1, 2, 0]]*.collect(intToCommit)
   }
 
   def 'log with max commits returns that number of commits'() {
@@ -57,7 +57,7 @@ class LogOpSpec extends SimpleGitOpSpec {
 
   def 'log with skip commits does not return the first x commits'() {
     expect:
-    grgit.log(skipCommits:2) == [3, 1, 2, 0].collect(intToCommit)
+    grgit.log(skipCommits:2) in [[3, 2, 1, 0], [3, 1, 2, 0]]*.collect(intToCommit)
   }
 
   def 'log with range returns only the commits in that range'() {

grgit-gradle/src/compatTest/groovy/org/ajoberstar/grgit/gradle/GrgitServicePluginCompatTest.groovy

@@ -33,17 +33,15 @@ plugins {
   id 'org.ajoberstar.grgit.service' version '${System.properties['compat.plugin.version']}'
 }
 
-tasks.register("doStuff", DoStuffTask.class) {
-    service = grgitService.service
-}
+tasks.register("doStuff", DoStuffTask, grgitService.service)
 
 class DoStuffTask extends DefaultTask {
-    @Input
-    final Property<GrgitService> service
+    private final Provider<GrgitService> service
 
     @Inject
-    DoStuffTask(ObjectFactory objectFactory) {
-        this.service = objectFactory.property(GrgitService.class);
+    DoStuffTask(Provider<GrgitService> service) {
+        this.service = service
+        usesService(service)
     }
 
     @TaskAction

grgit-gradle/src/main/java/org/ajoberstar/grgit/gradle/GrgitServiceExtension.java

@@ -1,19 +1,15 @@
 package org.ajoberstar.grgit.gradle;
 
-import javax.inject.Inject;
-
-import org.gradle.api.model.ObjectFactory;
-import org.gradle.api.provider.Property;
+import org.gradle.api.provider.Provider;
 
 public class GrgitServiceExtension {
-  private Property<GrgitService> service;
+  private final Provider<GrgitService> service;
 
-  @Inject
-  public GrgitServiceExtension(ObjectFactory objectFactory) {
-    this.service = objectFactory.property(GrgitService.class);
+  public GrgitServiceExtension(Provider<GrgitService> service) {
+    this.service = service;
   }
 
-  public Property<GrgitService> getService() {
+  public Provider<GrgitService> getService() {
     return service;
   }
 }

grgit-gradle/src/main/java/org/ajoberstar/grgit/gradle/GrgitServicePlugin.java

@@ -7,14 +7,12 @@
 public class GrgitServicePlugin implements Plugin<Project> {
   @Override
   public void apply(Project project) {
-    GrgitServiceExtension extension = project.getExtensions().create("grgitService", GrgitServiceExtension.class);
-
     Provider<GrgitService> serviceProvider = project.getGradle().getSharedServices().registerIfAbsent("grgit", GrgitService.class, spec -> {
       spec.getParameters().getCurrentDirectory().set(project.getLayout().getProjectDirectory());
       spec.getParameters().getInitIfNotExists().set(false);
       spec.getMaxParallelUsages().set(1);
     });
 
-    extension.getService().set(serviceProvider);
+    project.getExtensions().create("grgitService", GrgitServiceExtension.class, serviceProvider);
   }
 }