Skip to content
This repository has been archived by the owner on Feb 13, 2021. It is now read-only.

Commit

Permalink
Merge pull request #11 in AOLP_ADS_JS/prebid.js from feature/aol-bran…
Browse files Browse the repository at this point in the history
…ding-and-versioning to master

* commit '4d1f59405051110c1d98c16798330877e8cd33cd':
  Switched to AOL naming and versioning; dropped bower.json
  • Loading branch information
marian-r committed Aug 18, 2016
2 parents dc9d5af + 4d1f594 commit 7c26d81
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 31 deletions.
26 changes: 0 additions & 26 deletions bower.json

This file was deleted.

4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ var replace = require('gulp-replace');

var CI_MODE = process.env.NODE_ENV === 'ci';
var prebid = require('./package.json');
var dateString = 'Updated : ' + (new Date()).toISOString().substring(0, 10);
var dateString = 'Updated: ' + (new Date()).toISOString().substring(0, 10);
var packageNameVersion = prebid.name + '_' + prebid.version;
var banner = '/* <%= prebid.name %> v<%= prebid.version %>\n' + dateString + ' */\n';
var banner = '/* <%= prebid.name %> v<%= prebid.version %>, ' + dateString + ' */\n';
var analyticsDirectory = '../analytics';

// Tasks
Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "prebid.js",
"version": "0.11.0",
"description": "Header Bidding Management Library",
"name": "aol-container-tag",
"version": "1.0.0",
"description": "AOL Header Bidding Container Tag Library",
"main": "src/prebid.js",
"scripts": {
"test": "gulp test"
Expand All @@ -13,6 +13,10 @@
"globalVarName": "pbjs",
"analytics": ["aol"],
"author": "the prebid.js contributors",
"contributors": [{
"name": "AOL Platforms",
"url": "http://www.aolplatforms.com/"
}],
"license": "Apache-2.0",
"devDependencies": {
"babel-core": "^6.5.2",
Expand Down

0 comments on commit 7c26d81

Please sign in to comment.