- updated build plugins to latest versions

- removed GrGit.open calls and replaced with grgit plugin and system properties
EMCECS · Sep 12, 2016 · 8c0e9d5 · 8c0e9d5
1 parent 5d61db6
commit 8c0e9d5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/ecs-publish.buildscript.gradle b/ecs-publish.buildscript.gradle
@@ -28,6 +28,6 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    classpath 'org.ajoberstar:gradle-git:1.1.0',
-            'net.saliman:gradle-cobertura-plugin:2.2.5'
+    classpath 'org.ajoberstar:gradle-git:1.5.1'
+    classpath 'net.saliman:gradle-cobertura-plugin:2.3.2'
 }
diff --git a/ecs-publish.gradle b/ecs-publish.gradle
@@ -81,8 +81,6 @@ buildscript {
     apply from: "$commonBuildDir/ecs-publish.buildscript.gradle", to: buildscript
 }
 
-import org.ajoberstar.grgit.*
-
 apply plugin: 'idea'
 apply plugin: 'eclipse'
 apply plugin: 'java'
@@ -117,8 +115,9 @@ gradle.taskGraph.whenReady { taskGraph ->
             githubPages.credentials.password = new String(System.console().readPassword('\nGithub password: '))
         }
         if (taskGraph.hasTask(':release')) {
-            def gitPassword = new String(System.console().readPassword('\nASD git password: '))
-            release.grgit = Grgit.open(project.file('.'), new Credentials(gitUsername, gitPassword))
+            def gitPassword = new String(System.console().readPassword('\nOrigin password: '))
+            System.setProperty('org.ajoberstar.grgit.auth.username', gitUsername)
+            System.setProperty('org.ajoberstar.grgit.auth.password', gitPassword)
         }
     }
 }
@@ -277,6 +276,7 @@ aggregateDocs.dependsOn { subprojects.collect { it.tasks['aggregateDocs'] } }
 // we can't release or publish sub-projects
 if (isRootProject) {
     apply plugin: 'base'
+    apply plugin: 'org.ajoberstar.grgit'
     apply plugin: 'org.ajoberstar.github-pages'
     apply plugin: 'org.ajoberstar.release-opinion'
 
@@ -294,9 +294,6 @@ if (isRootProject) {
     }
     publishGhPages.dependsOn aggregateDocs, test
 
-    release {
-        grgit = Grgit.open(project.file('.'))
-    }
     tasks.release.dependsOn test, uploadJars, publishGhPages, distZip
 } else {
     task publishGhPages << {}
@@ -309,5 +306,5 @@ clean {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.9'
+    gradleVersion = '2.14'
 }
diff --git a/ecs-tool.buildscript.gradle b/ecs-tool.buildscript.gradle
@@ -25,8 +25,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 repositories {
-    jcenter { url 'http://jcenter.bintray.com/' }
+    jcenter()
 }
 dependencies {
-    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.2'
+    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
 }