Merge branch 'development' into jo-WWDC-Safari-Integration

# Conflicts:
#	source/adapter.js
#	third_party/adapter

Gruntfile.js

@@ -10,7 +10,6 @@ module.exports = function(grunt) {
     grunt.loadNpmTasks('grunt-replace');
     grunt.loadNpmTasks('grunt-include-replace');
     grunt.loadNpmTasks('grunt-karma');
-    grunt.loadNpmTasks('grunt-githash');
     grunt.loadNpmTasks('grunt-string-replace');
 
     grunt.initConfig({
@@ -23,22 +22,10 @@ module.exports = function(grunt) {
       production: 'publish',
       bamboo: 'bamboo',
 
-      // webrtc-adapter submodule
-      webrtcAdapterSubmodule: 'third_party/adapter/',
-      googleAdapterPath: '<%= webrtcAdapterSubmodule %>/out/adapter.js',
-
       pluginInfoRoot: grunt.option('pluginInfoRoot') || '<%= source %>',
       pluginInfoFile: grunt.option('pluginInfoFile') || 'pluginInfo.js',
 
-      githash: {
-        submodule: {
-          options: {
-            dir: '<%= webrtcAdapterSubmodule %>'
-          }
-        },
-      },
-
-      version: '<%= pkg.version %>-<%= githash.submodule.short %>',
+      version: '<%= pkg.version %>',
 
       clean: {
         production: ['<%= production %>/'],
@@ -323,13 +310,6 @@ module.exports = function(grunt) {
         grunt.log.writeln('bamboo/vars file successfully created');
     });
 
-    grunt.registerTask('CheckSubmodules', 'Checks that third_party/adapter is properly checked out', function() {
-      if(!grunt.file.exists(grunt.config.get('googleAdapterPath'))) {
-        grunt.fail.fatal('Couldn\'t find ' + grunt.config.get('googleAdapterPath') + '\n' +
-                      'Output would be incomplete. Did you remember to initialize submodules?\nPlease run: git submodule update --init');
-      }
-    });
-
     grunt.registerTask('CheckPluginInfo', 'Checks for existing config file', function() {
       var fullPath = grunt.config.get('pluginInfoRoot') + '/' + grunt.config.get('pluginInfoFile');
       grunt.verbose.writeln('Checking that the plugin info file exists.');
@@ -356,8 +336,6 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('publish', [
-        'githash',
-        'CheckSubmodules',
         'CheckPluginInfo',
         // 'webrtc-adapter',
         'versionise',

README.md

@@ -311,11 +311,10 @@ AdapterJS.extensionInfo = {
 ```
 
 ## Setup this project
-1. Copy this repository with submodules (`git clone --recursive ...`), or run `git submodule init` and `git submodule update`.
-2. Install or update to at lest version `0.10.26` of node and version `1.4.6 `of npm.
-3. Install `grunt-cli`. (See: http://gruntjs.com/getting-started)
-4. Run `npm install` to install dev dependencies.
-5. Run `npm install -g browserify` and `npm install -g testling` (might require sudo) to install the necessary tools to test locally
+1. Install or update to at lest version `0.10.26` of node and version `1.4.6 `of npm.
+2. Install `grunt-cli`. (See: http://gruntjs.com/getting-started)
+3. Run `npm install` to install dev dependencies.
+4. Run `npm install -g browserify` and `npm install -g testling` (might require sudo) to install the necessary tools to test locally
 
 
 ## Development
@@ -344,8 +343,5 @@ You can also run `grunt karma` to run the test and bypass the publish step.
 
 (Mac only) If you are testing the Temasys WebRTC Plugin, you can run `osascript tests/mac.watcher.scpt` to automatically validate the permission popup.
 
-##### `third_party/`
-The `webrtc/adapter` dependency linked repo at commit version.
-
 ## License
 APACHE 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html

package.json

@@ -19,7 +19,6 @@
     }
   ],
   "scripts": {
-    "postinstall": "npm --prefix third_party/adapter install third_party/adapter",
     "version": "grunt publish",
     "prepublish": "grunt publish",
     "test": "./test.sh;"
@@ -55,7 +54,8 @@
     "karma-safari-launcher": "^0.1.1",
     "karma-script-launcher": "0.1.0",
     "mocha": "2.1.0",
-    "requirejs": "^2.1.19"
+    "requirejs": "^2.1.19",
+    "webrtc-adapter": "5.0.1"
   },
   "testling": {
     "files": "tmp/*.js",