<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][11038] trunk: Move composer.json to root and update Grunt (attempt #2).</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11038">11038</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11038","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-25 08:47:03 +0000 (Thu, 25 Aug 2016)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Move composer.json to root and update Grunt (attempt <a href="http://buddypress.trac.wordpress.org/ticket/2">#2</a>).

Basic Composer support was added in v2.2, enabling distribution of BuddyPress via Packagist. As we had no plans to use any developer-facing features of Composer, the config file was placed into the /src/ subfolder (i.e. the root folder of the distribution version of BuddyPress) to simplify our release build process.

Moving the Composer config file into the root of the development version of the plugin, while copying it back into place for the distribution version, smooths the way towards enabling us to use Composer to install development-only libraries.

This may help us maintain a high-quality codebase. An example tickets where Composer is being considered for use as a development aid is <a href="http://buddypress.trac.wordpress.org/ticket/7228">#7228</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkgitignore">trunk/.gitignore</a></li>
<li><a href="#trunktravisyml">trunk/.travis.yml</a></li>
<li><a href="#trunkGruntfilejs">trunk/Gruntfile.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkcomposerjson">trunk/composer.json</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrccomposerjson">trunk/src/composer.json</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkgitignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.gitignore</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.gitignore  2016-08-24 17:01:06 UTC (rev 11037)
+++ trunk/.gitignore    2016-08-25 08:47:03 UTC (rev 11038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> logs
</span><span class="cx" style="display: block; padding: 0 10px"> results
</span><span class="cx" style="display: block; padding: 0 10px"> src/vendor
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+vendor
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> node_modules
</span><span class="cx" style="display: block; padding: 0 10px"> npm-debug.log
</span></span></pre></div>
<a id="trunktravisyml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/.travis.yml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/.travis.yml 2016-08-24 17:01:06 UTC (rev 11037)
+++ trunk/.travis.yml   2016-08-25 08:47:03 UTC (rev 11038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> language: php
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#cache:
-#  apt: true
-#  directories:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+cache:
+  directories:
+    - $HOME/.composer/cache
</ins><span class="cx" style="display: block; padding: 0 10px"> #    - /tmp/wordpress/src/wp-content/plugins/buddypress/node_modules
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px"> php:
</span></span></pre></div>
<a id="trunkGruntfilejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/Gruntfile.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/Gruntfile.js        2016-08-24 17:01:06 UTC (rev 11037)
+++ trunk/Gruntfile.js  2016-08-25 08:47:03 UTC (rev 11038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,6 +173,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                                dot: true,
</span><span class="cx" style="display: block; padding: 0 10px">                                                expand: true,
</span><span class="cx" style="display: block; padding: 0 10px">                                                src: ['**', '!**/.{svn,git}/**'].concat( BP_EXCLUDED_MISC )
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                        },
+                                       {
+                                               dest: BUILD_DIR,
+                                               dot: true,
+                                               expand: true,
+                                               src: ['composer.json']
</ins><span class="cx" style="display: block; padding: 0 10px">                                         }
</span><span class="cx" style="display: block; padding: 0 10px">                                ]
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span></span></pre></div>
<a id="trunkcomposerjsonfromrev11037trunksrccomposerjson"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/composer.json (from rev 11037, trunk/src/composer.json)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/composer.json                               (rev 0)
+++ trunk/composer.json 2016-08-25 08:47:03 UTC (rev 11038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,34 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+{
+  "name": "buddypress/buddypress",
+  "description": "BuddyPress helps site builders and WordPress developers add community features to their websites, with user profile fields, activity streams, messaging, and notifications.",
+  "type": "wordpress-plugin",
+  "keywords": [
+    "activity",
+    "community",
+    "forum",
+    "friends",
+    "groups",
+    "messaging",
+    "notifications",
+    "profiles",
+    "social network"
+  ],
+  "homepage": "https://buddypress.org",
+  "license": "GPL-2.0+",
+  "authors": [ {
+    "name": "BuddyPress Community",
+    "homepage": "https://buddypress.org/about/"
+  } ],
+  "support": {
+    "forum": "https://buddypress.org/support/",
+    "docs": "https://codex.buddypress.org/",
+    "issues": "https://buddypress.trac.wordpress.org/",
+    "rss": "https://buddypress.org/feed/",
+    "source": "https://buddypress.trac.wordpress.org/browser/",
+    "wiki": "https://codex.buddypress.org/"
+  },
+  "require": {
+    "composer/installers": "~1.0",
+    "php": ">=5.2.4"
+  }
+}
</ins></span></pre></div>
<a id="trunksrccomposerjson"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/composer.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/composer.json   2016-08-24 17:01:06 UTC (rev 11037)
+++ trunk/src/composer.json     2016-08-25 08:47:03 UTC (rev 11038)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,34 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-{
-  "name": "buddypress/buddypress",
-  "description": "BuddyPress helps site builders and WordPress developers add community features to their websites, with user profile fields, activity streams, messaging, and notifications.",
-  "type": "wordpress-plugin",
-  "keywords": [
-    "activity",
-    "community",
-    "forum",
-    "friends",
-    "groups",
-    "messaging",
-    "notifications",
-    "profiles",
-    "social network"
-  ],
-  "homepage": "https://buddypress.org",
-  "license": "GPL-2.0+",
-  "authors": [ {
-    "name": "BuddyPress Community",
-    "homepage": "https://buddypress.org/about/"
-  } ],
-  "support": {
-    "forum": "https://buddypress.org/support/",
-    "docs": "https://codex.buddypress.org/",
-    "issues": "https://buddypress.trac.wordpress.org/",
-    "rss": "https://buddypress.org/feed/",
-    "source": "https://buddypress.trac.wordpress.org/browser/",
-    "wiki": "https://codex.buddypress.org/"
-  },
-  "require": {
-    "composer/installers": "~1.0",
-    "php": ">=5.2.4"
-  }
-}
</del></span></pre>
</div>
</div>

</body>
</html>