Skip to content

Commit 6374086

Browse files
committed
Merge pull request #20 from cybertk/deps
Bump yeoman-geneartor to v0.22
2 parents 6c1f81f + 33d5648 commit 6374086

File tree

21 files changed

+58
-53
lines changed

21 files changed

+58
-53
lines changed

generators/app/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33
var chalk = require('chalk')
44
var yosay = require('yosay')
55
var _ = require('underscore')
66

7-
module.exports = yeoman.generators.Base.extend({
7+
module.exports = generators.Base.extend({
88
constructor: function () {
9-
yeoman.generators.Base.apply(this, arguments)
9+
generators.Base.apply(this, arguments)
1010

1111
// This method adds support for a `--skip-install` flag
1212
this.option('skipInstall', {

generators/carthage/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77

88
this.option('skipInstall', {
99
type: Boolean,

generators/cocoapods/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77

88
this.option('githubUser', {
99
type: String,

generators/contributing/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77

88
this.option('projectName', {
99
type: String,

generators/gitignore/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77
},
88

99
initializing: function () {

generators/license/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77

88
this.option('organizationName', {
99
type: String,

generators/mobileprovision/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33
var path = require('path')
44
var fs = require('fs')
55

@@ -10,9 +10,9 @@ var resolvePath = function (string) {
1010
return path.resolve(string)
1111
}
1212

13-
module.exports = yeoman.generators.Base.extend({
13+
module.exports = generators.Base.extend({
1414
constructor: function () {
15-
yeoman.generators.Base.apply(this, arguments)
15+
generators.Base.apply(this, arguments)
1616

1717
this.option('organizationName', {
1818
type: String,

generators/readme/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77

88
this.option('githubUser', {
99
type: String,

generators/script/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77

88
this.option('projectName', {
99
type: String,

generators/travis/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33

4-
module.exports = yeoman.generators.Base.extend({
4+
module.exports = generators.Base.extend({
55
constructor: function () {
6-
yeoman.generators.Base.apply(this, arguments)
6+
generators.Base.apply(this, arguments)
77
},
88

99
initializing: function () {

generators/xcode/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict'
2-
var yeoman = require('yeoman-generator')
2+
var generators = require('yeoman-generator')
33
var glob = require('glob')
44

5-
module.exports = yeoman.generators.Base.extend({
5+
module.exports = generators.Base.extend({
66
constructor: function () {
7-
yeoman.generators.Base.apply(this, arguments)
7+
generators.Base.apply(this, arguments)
88

99
this.option('organizationName', {
1010
type: String,

package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
"description": "Scaffolds out a Xcode Embedded Framework project with Swift 2.0",
55
"license": "MIT",
66
"main": "app/index.js",
7-
"repository": "cybertk/generator-swift-framework",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/cybertk/generator-swift-framework.git"
10+
},
811
"author": {
912
"name": "",
1013
"email": "",
@@ -32,10 +35,12 @@
3235
"glob": "^7.0.3",
3336
"underscore": "^1.8.3",
3437
"yamljs": "^0.2.3",
35-
"yeoman-generator": "^0.20.3",
38+
"yeoman-generator": "^0.22.5",
3639
"yosay": "^1.0.5"
3740
},
3841
"devDependencies": {
42+
"yeoman-assert": "^2.0.0",
43+
"yeoman-test": "^1.0.0",
3944
"mocha": "^2.4.5",
4045
"standard": "^6.0.8"
4146
}

test/test-app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
assert.noFilesContent = function (files, pattern) {
1010
files.forEach(function (file) {

test/test-carthage.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:carthage', function () {
1010
describe('with all features enabled', function () {

test/test-cocoapods.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:cocoapods', function () {
1010
var pattern = /(<%=|%>)/

test/test-contributing.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:contributing', function () {
1010
var pattern = /(<%=|%>)/

test/test-gitignore.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:gitignore', function () {
1010
describe('with all features enabled', function () {

test/test-license.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:license', function () {
1010
var pattern = /(<%=|%>)/

test/test-readme.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:readme', function () {
1010
var pattern = /(<%=|%>)/

test/test-script.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:script', function () {
1010
var pattern = /(<%=|%>)/

test/test-travis.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
'use strict'
44

55
var path = require('path')
6-
var assert = require('yeoman-generator').assert
7-
var helpers = require('yeoman-generator').test
6+
var assert = require('yeoman-assert')
7+
var helpers = require('yeoman-test')
88

99
describe('swift.framework:travis', function () {
1010
describe('with all features enabled', function () {

0 commit comments

Comments
 (0)