update gradle and versions plugin

update deps; remove manual wrapper copying (binary check fixed in yeoman)

Author: xvik

CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.0.2 (2015-02-23)
+
+* Update gradle 2.2.1 -> 2.3
+* Update gradle-versions-plugin 0.7 -> 0.8
+
 ### 1.0.1 (2015-02-12)
 
 * Update gradle-bintray-plugin 1.0 -> 1.1

app/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+// update generator to 1.18.9 or above when new windows inslaller release with updated npm (2.6)
+// because new yeoman 1.4.5 required for proper work
 var yeoman = require('yeoman-generator'),
     chalk = require('chalk'),
     path = require('path'),
@@ -367,7 +369,7 @@ module.exports = yeoman.generators.Base.extend({
             var signature = {
                 '1.6': 'org.codehaus.mojo.signature:java16-sun:+@signature',
                 '1.7': 'org.codehaus.mojo.signature:java17:+@signature',
-                '1.8': '' // switch off animalsniffer for latest java
+                '1.8': '' // switch off animalsniffer for the latest java
             };
             var travis = {
                 '1.6': 'oraclejdk7', // better use oraclejdk, compatibility will be checked with animalsniffer
@@ -396,20 +398,9 @@ module.exports = yeoman.generators.Base.extend({
             ];
             this.gradlewExists = this.helper.exists('gradlew');
 
+            this.helper.copy('gradle-base', {writeOnceFiles: writeOnceFiles});
 
-            // avoid copying jar file due conflict resolution mistake: https://github.com/yeoman/generator/issues/717
-            // (in memory content is wring and so comparison failed). this way jar file avoid any collision checks and gets copied as is each time
-            this.helper.copy('gradle-base',
-                {glob: '**/*[!.jar]', writeOnceFiles: writeOnceFiles});
-
-            // do resolution manually until issue fixed
-            this.helper.bulkChangeCopy(
-                'gradle-base/gradle/wrapper/gradle-wrapper.jar',
-                'gradle/wrapper/gradle-wrapper.jar'
-            );
-
-            this.helper.copyTpl('project-base',
-                {writeOnceFiles: writeOnceFiles});
+            this.helper.copyTpl('project-base', {writeOnceFiles: writeOnceFiles});
         },
 
         sources: function () {

app/templates/gradle-base/gradle/buildscript.gradle

@@ -10,7 +10,7 @@ dependencies {
     // coveralls integration
     classpath "org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.3.1"
     // check dependencies updates
-    classpath "com.github.ben-manes:gradle-versions-plugin:0.7"
+    classpath "com.github.ben-manes:gradle-versions-plugin:0.8"
     classpath 'com.github.townsfolk:gradle-release:1.2'
     classpath "be.insaneprogramming.gradle:animalsniffer-gradle-plugin:1.4.0"
 }

app/templates/gradle-base/gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Wed Dec 10 00:12:55 NOVT 2014
+#Mon Feb 23 06:44:37 NOVT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip

app/templates/gradle-base/gradle/wrapper/gradle-wrapper.properties

@@ -11,7 +11,7 @@ description = '<%= libDesc %>'
 // convention: project.name == github project name == bintray package page
 project.ext {
     build = {
-        gradle = '2.2.1'
+        gradle = 2.3
         java = <%= targetJava %>
         // if not empty runs animal sniffer on compile to guarantee binary compatibility; set '' to disable
         signature = '<%= animalsnifferSignature %>'

app/templates/project-base/build.gradle

@@ -7,7 +7,6 @@ var url = require('url'),
     properties = require('properties'),
     fs = require('fs'),
     _s = require('underscore.string'),
-    detectConflict = require('detect-conflict'),
     chalk = require('chalk'),
     Insight = require('insight');
 
@@ -97,24 +96,6 @@ _.extend(Helper.prototype, {
         return 'The package name you have provided is not a valid Java package name.';
     },
 
-    detectConflict: function (sourcePath, targetPath) {
-        var content = fs.readFileSync(sourcePath);
-        return detectConflict(targetPath, content);
-    },
-
-    bulkChangeCopy: function (sourcePath, targetPath) {
-        var src = this.$.templatePath(sourcePath);
-        var dest = this.$.destinationPath(targetPath);
-        if (!fs.existsSync(dest) || this.detectConflict(src, dest)) {
-            this.$.bulkCopy(
-                src,
-                dest
-            );
-        } else {
-            this.$.log(chalk.cyan('identical ') + dest.substr(this.$.destinationPath().length + 1));
-        }
-    },
-
     exists: function (filePath) {
         return fs.existsSync(this.$.destinationPath(filePath));
     },

app/utils.js

@@ -1,6 +1,6 @@
 {
   "name": "generator-lib-java",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Java library project generator, hosted on github, build with gradle and published to bintray and maven central",
   "license": "MIT",
   "main": "app/index.js",
@@ -36,23 +36,21 @@
   "dependencies": {
     "chalk": "^0.5.1",
     "configstore": "^0.3.2",
-    "detect-conflict": "^1.0.0",
     "github": "^0.2.3",
     "insight": "^0.5.2",
-    "lodash": "^3.1.0",
+    "lodash": "^3.3.0",
     "properties": "^1.2.1",
     "sprintf": "^0.1.5",
     "underscore.string": "^3.0.3",
     "user-home": "^1.1.1",
-    "yeoman-generator": "^0.18.8"
+    "yeoman-generator": "0.18.8"
   },
   "devDependencies": {
-    "exec": "^0.2.0",
     "fs-readdir-recursive": "^0.1.0",
     "mocha": "*",
     "mocha-jshint": "0.0.9"
   },
   "peerDependencies": {
-    "yo": ">=1.0.0"
+    "yo": ">=1.4.2"
   }
 }

package.json

@@ -4,7 +4,7 @@ var path = require('path'),
     assert = require('yeoman-generator').assert,
     helpers = require('yeoman-generator').test,
     read = require('fs-readdir-recursive'),
-    exec = require('exec');
+    execFile = require('child_process').execFile;
 
 describe('lib-java generator', function () {
     var appPath = path.join(__dirname, '../app'),
@@ -52,11 +52,11 @@ describe('lib-java generator', function () {
         this.timeout(300000); //5 min should be enough to download everything
         var isWin = /^win/.test(process.platform),
             targetFile = targetPath + '/testlib/gradlew' + (isWin ? '.bat' : '');
-        exec([targetFile, 'check'], function (err, out, code) {
+        execFile(targetFile, ['check'], function (err, stdout, stderr) {
             if (err instanceof Error)
                 throw err;
-            process.stderr.write(err);
-            process.stdout.write(out);
+            console.log(stdout);
+            console.log(stderr);
             done();
         });
     });