Skip to content

Commit

Permalink
Merge branch 'merge_6.4.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
davies147 committed Dec 5, 2018
2 parents c7f0ddd + ba0c53b commit 952ba25
Show file tree
Hide file tree
Showing 38 changed files with 2,939 additions and 2,941 deletions.
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"browser": true,
"node": true
},
"extends": ["eslint:recommended", "webrtc"],
"extends": ["eslint:recommended"],
"globals": {
"module": true,
"require": true,
Expand Down
11 changes: 2 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: trusty
language: node_js
node_js:
- 6
- 8

addons:
apt:
Expand Down Expand Up @@ -36,18 +36,11 @@ before_script:
- export FIREFOX_BIN=browsers/bin/firefox-${BVER}
- sh -e /etc/init.d/xvfb start
- pulseaudio --start
- if [ "$BROWSER" = "Electron" ]; then npm i karma-electron electron; fi
- if [ "$BROWSER" = "Electron" ]; then npm i karma-electron electron karma-stability-reporter; fi

script:
- node_modules/.bin/grunt
- npm test

after_failure:
- for file in *.log; do echo $file; echo "======================"; cat $file; done || true

notifications:
email:
recipients:
[email protected]
on_success: change
on_failure: always
6 changes: 0 additions & 6 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@ module.exports = function(grunt) {
}
}
},
githooks: {
all: {
'pre-commit': 'lint'
}
},
eslint: {
options: {
configFile: '.eslintrc'
Expand All @@ -75,7 +70,6 @@ module.exports = function(grunt) {
},
});

grunt.loadNpmTasks('grunt-githooks');
grunt.loadNpmTasks('grunt-eslint');
grunt.loadNpmTasks('grunt-browserify');
grunt.loadNpmTasks('grunt-contrib-copy');
Expand Down
1 change: 1 addition & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Copyright (c) 2014, The WebRTC project authors. All rights reserved.
Copyright (c) 2018, The adapter.js project authors. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down
13 changes: 7 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
[![Build Status](https://travis-ci.org/webrtc/adapter.svg)](https://travis-ci.org/webrtc/adapter)
[![Build Status](https://travis-ci.org/webrtcHacks/adapter.svg)](https://travis-ci.org/webrtc/adapter)

# WebRTC adapter #
adapter.js is a shim to insulate apps from spec changes and prefix differences. In fact, the standards and protocols used for WebRTC implementations are highly stable, and there are only a few prefixed names. For full interop information, see [webrtc.org/web-apis/interop](https://www.webrtc.org/web-apis/interop).

This repository used to be part of the WebRTC organisation on github but moved. We aim to keep
the old repository updated with new releases.

## Install ##

#### NPM
Expand All @@ -22,7 +25,7 @@ See [webrtc/samples repo](https://github.com/webrtc/samples) as an example on ho

#### Prebuilt releases
##### Web
In the [gh-pages branch](https://github.com/webrtc/adapter/tree/gh-pages) prebuilt ready to use files can be downloaded/linked directly.
In the [gh-pages branch](https://github.com/webrtcHacks/adapter/tree/gh-pages) prebuilt ready to use files can be downloaded/linked directly.
Latest version can be found at https://webrtc.github.io/adapter/adapter-latest.js.
Specific versions can be found at https://webrtc.github.io/adapter/adapter-N.N.N.js, e.g. https://webrtc.github.io/adapter/adapter-1.0.2.js.

Expand All @@ -39,17 +42,15 @@ In node_modules/webrtc-adapter/out/ folder you will find 4 files:
Include the file that suits your need in your project.

## Development ##
Detailed information on developing in the [webrtc](https://github.com/webrtc) github repo can be found in the [WebRTC GitHub repo developer's guide](https://docs.google.com/document/d/1tn1t6LW2ffzGuYTK3366w1fhTkkzsSvHsBnOHoDfRzY/edit?pli=1#heading=h.e3366rrgmkdk).

Head over to [test/README.md](https://github.com/webrtc/samples/blob/gh-pages/test/README.md) and get started developing.
Head over to [test/README.md](https://github.com/webrtcHacks/adapter/blob/gh-pages/test/README.md) and get started developing.

## Publish a new version ##
* Go to the adapter repository root directory
* Make sure your repository is clean, i.e. no untracked files etc. Also check that you are on the master branch and have pulled the latest changes.
* Depending on the impact of the release, either use `patch`, `minor` or `major` in place of `<version>`. Run `npm version <version> -m 'bump to %s'` and type in your password lots of times (setting up credential caching is probably a good idea).
* Create and merge the PR if green in the GitHub web ui
* Go to the releases tab in the GitHub web ui and edit the tag.
* Add a summary of the recent commits in the tag summary and a link to the diff between the previous and current version in the description, [example](https://github.com/webrtc/adapter/releases/tag/v3.4.1).
* Add a summary of the recent commits in the tag summary and a link to the diff between the previous and current version in the description, [example](https://github.com/webrtcHacks/adapter/releases/tag/v3.4.1).
* Go back to your checkout and run `git pull`
* Run `npm publish` (you need access to the [webrtc-adapter npmjs package](https://www.npmjs.com/package/webrtc-adapter))
* Done! There should now be a new release published to NPM and the gh-pages branch.
Expand Down
14 changes: 4 additions & 10 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
"main": "./release/adapter.js",
"repository": {
"type": "git",
"url": "https://github.com/webrtc/adapter.git"
"url": "https://github.com/webrtchacks/adapter.git"
},
"authors": [
"The WebRTC project authors (https://www.webrtc.org/)"
"The WebRTC project authors (https://www.webrtc.org/)",
"The adapter.js project authors (https://github.com/webrtchacks/adapter/)"
],
"moduleType": [
"node"
Expand All @@ -18,14 +19,7 @@
],
"keywords": [
"WebRTC",
"PeerConnection",
"RTCPeerConnection",
"getUserMedia",
"Chrome",
"Chromium",
"Firefox",
"Edge",
"Adapter",
"Shim"
"getUserMedia"
]
}
28 changes: 13 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
{
"name": "webrtc-adapter",
"version": "6.1.4",
"version": "6.4.8",
"description": "A shim to insulate apps from WebRTC spec changes and browser prefix differences",
"license": "BSD-3-Clause",
"main": "./src/js/adapter_core.js",
"repository": {
"type": "git",
"url": "https://github.com/webrtc/adapter.git"
"url": "https://github.com/webrtchacks/adapter.git"
},
"authors": [
"The WebRTC project authors (https://www.webrtc.org/)"
"The WebRTC project authors (https://www.webrtc.org/)",
"The adapter.js project authors (https://github.com/webrtchacks/adapter/)"
],
"scripts": {
"preversion": "git stash && npm install && npm update && BROWSER=chrome BVER=stable CI=true npm test && git checkout -B bumpVersion && grunt build && grunt copyForPublish && git add package.json release/* && git commit -m 'Add adapter artifacts' --allow-empty",
Expand All @@ -19,8 +20,8 @@
"test": "grunt && grunt downloadBrowser && mocha test/unit && karma start test/karma.conf.js"
},
"dependencies": {
"rtcpeerconnection-shim": "^1.2.9",
"sdp": "^2.7.0"
"rtcpeerconnection-shim": "^1.2.14",
"sdp": "^2.9.0"
},
"engines": {
"npm": ">=3.10.0",
Expand All @@ -29,16 +30,14 @@
"devDependencies": {
"brfs": "^1.5.0",
"chai": "^3.5.0",
"eslint-config-webrtc": "^1.0.0",
"grunt": "^0.4.5",
"grunt-browserify": "^4.0.1",
"grunt-cli": ">=0.1.9",
"grunt-contrib-clean": "^1.0.0",
"grunt": "^1.0.3",
"grunt-browserify": "^5.3.0",
"grunt-cli": "^1.3.1",
"grunt-contrib-clean": "^1.1.0",
"grunt-contrib-copy": "^1.0.0",
"grunt-eslint": "^19.0.0",
"grunt-githooks": "^0.3.1",
"grunt-shell": "^2.1.0",
"karma": "^1.7.0",
"karma": "^3.0.0",
"karma-browserify": "^5.2.0",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^2.2.0",
Expand All @@ -47,11 +46,10 @@
"karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.3",
"karma-safari-launcher": "^1.0.0",
"karma-stability-reporter": "git+https://github.com/fippo/karma-stability-reporter.git#v2.1.0",
"mocha": "^3.2.0",
"karma-stability-reporter": "^3.0.1",
"mocha": "^5.2.0",
"sinon": "^2.2.0",
"sinon-chai": "^2.14.0",
"tape": "^4.9.0",
"travis-multirunner": "^4.4.0"
}
}
Loading

0 comments on commit 952ba25

Please sign in to comment.