fix #1 (deprecation warning) and update version number

nsoft · Oct 5, 2018 · 3c67871 · 3c67871
1 parent e9ca3e6
commit 3c67871
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,12 +6,12 @@ buildscript {
     }
   }
   dependencies {
-    classpath "com.gradle.publish:plugin-publish-plugin:0.9.5"
+    classpath "com.gradle.publish:plugin-publish-plugin:0.10.0"
   }
 }
 
 group 'com.needhamsoftware'
-version '1.0.1'
+version '1.0.2'
 
 apply plugin: 'groovy'
 apply plugin: 'maven-publish'
@@ -34,7 +34,7 @@ publishing {
     mavenJava(MavenPublication) {
       groupId 'com.needhamsoftware'
       artifactId 'solr-gradle'
-      version '1.0.1'
+      version '1.0.2'
       from components.java
     }
   }

diff --git a/src/main/groovy/com/needhamsoftware/gradle/solr/SolrGradlePlugin.groovy b/src/main/groovy/com/needhamsoftware/gradle/solr/SolrGradlePlugin.groovy
@@ -30,21 +30,27 @@ class SolrGradlePlugin implements Plugin<Project> {
     project.extensions.create('solr', SolrGradleExtension)
 
     //// UPCONFIG ////
-    
+
     //noinspection GroovyAssignabilityCheck
-    project.task('upconfig', {group 'solr'}) << {
-      ZkCLI.main('-zkhost', project.solr.zkHost, '-cmd',
-          'upconfig', '-confname', project.solr.confName, '-confdir', project.file(project.solr.confDir).toString() )
+    project.task('upconfig') {
+      group 'solr'
+      doLast {
+        ZkCLI.main('-zkhost', project.solr.zkHost, '-cmd',
+            'upconfig', '-confname', project.solr.confName, '-confdir', project.file(project.solr.confDir).toString())
+      }
     }
 
     //// DOWNCONFIG ////
 
     //noinspection GroovyAssignabilityCheck
-    project.task('downconfig', {group 'solr'}) << {
-      ZkCLI.main('-zkhost', project.solr.zkHost, '-cmd',
-          'downconfig', '-confname', project.solr.confName, '-confdir', project.file(project.solr.confDir).toString() )
+    project.task('downconfig') {
+      group 'solr'
+      doLast {
+        ZkCLI.main('-zkhost', project.solr.zkHost, '-cmd',
+            'downconfig', '-confname', project.solr.confName, '-confdir', project.file(project.solr.confDir).toString())
+      }
     }
-    
+
   }
 }