Merge branch 'deprecate-picturefill-json' into 3.0

scottjehl · Feb 5, 2016 · 7bd15ae · 7bd15ae
2 parents 5ddaa34 + b38bfb3
commit 7bd15ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 26 deletions.
diff --git a/gruntfile.js b/gruntfile.js
@@ -8,12 +8,12 @@
     // Project configuration.
     grunt.initConfig({
       // Metadata.
-      pkg: pkg = grunt.file.readJSON("picturefill.json"),
-      banner: "/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - " +
+      pkg: pkg = grunt.file.readJSON("package.json"),
+      banner: "/*! <%= pkg.name %> - v<%= pkg.version %> - " +
         "<%= grunt.template.today('yyyy-mm-dd') %>\n" +
         "<%= pkg.homepage ? ' * ' + pkg.homepage + '\\n' : '' %>" +
-        " * Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
-        " Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %>\n */\n",
+        " * Copyright (c) <%= grunt.template.today('yyyy') %> https://github.com/scottjehl/picturefill/blob/master/Authors.txt;" +
+        " Licensed <%= pkg.license %>\n */\n",
       // Task configuration.
       clean: {
         files: [ "dist" ]

diff --git a/picturefill.json b/picturefill.json