Skip to content

Commit

Permalink
fix(build): fix CI failures
Browse files Browse the repository at this point in the history
update to AngularJS 1.5.6
update phantomjs, jasmine, karma, and karma launchers, etc.
  • Loading branch information
Splaktar committed Jun 12, 2016
1 parent 0626559 commit a365c2a
Show file tree
Hide file tree
Showing 4 changed files with 156 additions and 144 deletions.
15 changes: 9 additions & 6 deletions bower.json
Expand Up @@ -23,17 +23,20 @@
"tests"
],
"dependencies": {
"angular": "1.5.0",
"angular-route": "1.5.0",
"angular-sanitize": "1.5.0",
"angular-aria": "1.5.0",
"angular-animate": "1.5.0",
"angular": "1.5.6",
"angular-route": "1.5.6",
"angular-sanitize": "1.5.6",
"angular-aria": "1.5.6",
"angular-animate": "1.5.6",
"angular-material": "1.0.5",
"google-material-icons": "2.0.0",
"font-awesome": "4.3.0"
},
"devDependencies": {
"angular-mocks": "1.5.0",
"angular-mocks": "1.5.6",
"jasmine-sinon": "0.4.0"
},
"resolutions": {
"angular": "1.5.6"
}
}
10 changes: 5 additions & 5 deletions config/CDN.json
@@ -1,11 +1,11 @@
{
"js":
[
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-animate.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-aria.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-route.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-sanitize.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-animate.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-aria.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-route.min.js",
"https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-sanitize.min.js",
"https://ajax.googleapis.com/ajax/libs/angular_material/1.0.5/angular-material.min.js"
],
"css":
Expand Down
252 changes: 130 additions & 122 deletions index.html
@@ -1,130 +1,138 @@
<!doctype html>
<html ng-app="gdgXBoomerang" itemscope itemtype="http://schema.org/Organization">
<head>
<title>Google Developer Group</title>
<link rel="canonical" ng-href="{{ canonical }}" />
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="description" content="Google Developer Groups (GDG) are technology user groups that meet to discuss the latest Technologies, Tools, SDKs, & APIs like Android, GWT, GAE, & GCP.">
<meta name="application-name" content="GDG Boomerang">
<meta name="fragment" content="!" />
<link href="https://fonts.googleapis.com/css?family=RobotoDraft:400,300,500,700,400italic" rel="stylesheet" >
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,700italic,300,700' rel='stylesheet'>
<!-- bower:css -->
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.5/angular-material.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<!-- endinject -->
<!-- inject:css -->
<link rel="stylesheet" href="app/css/gdg.css">
<!-- endinject -->
<link rel="icon" sizes="16x16 32x32" href="favicon.ico">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-41029375-2', 'auto');
ga('require', 'displayfeatures');
ga('require', 'linkid', 'linkid.js');
ga('send', 'pageview');
</script>
</head>
<body ng-controller="MainController as mc">
<head>
<title>Google Developer Group</title>
<link rel="canonical" ng-href="{{ canonical }}"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="description"
content="Google Developer Groups (GDG) are technology user groups that meet to discuss the latest Technologies, Tools, SDKs, & APIs like Android, Angular, Firebase, & GCP.">
<meta name="application-name" content="GDG Boomerang">
<meta name="fragment" content="!"/>
<link href="https://fonts.googleapis.com/css?family=RobotoDraft:400,300,500,700,400italic" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,700italic,300,700' rel='stylesheet'>
<!-- bower:css -->
<link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.5/angular-material.min.css">
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<!-- endinject -->
<!-- inject:css -->
<link rel="stylesheet" href="app/css/gdg.css">
<!-- endinject -->
<link rel="icon" sizes="16x16 32x32" href="favicon.ico">
<script>
(function(i, s, o, g, r, a, m) {
i['GoogleAnalyticsObject'] = r;
i[r] = i[r] || function() {
(i[r].q = i[r].q || []).push(arguments)
}, i[r].l = 1 * new Date();
a = s.createElement(o),
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m)
})(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga');
ga('create', 'UA-41029375-2', 'auto');
ga('require', 'displayfeatures');
ga('require', 'linkid', 'linkid.js');
ga('send', 'pageview');
</script>
</head>
<body ng-controller="MainController as mc">

<!-- TODO Edit here to update your snippet for sharing. -->
<span itemprop="name" style="display: none;">GDG Space Coast - Brevard County, FL, USA.</span>
<span itemprop="description" style="display: none;">Google Developer Group (GDG) Space Coast is a technology user group that meets to discuss the latest Google Technologies, Tools, SDKs, and APIs.</span>
<img itemprop="image" style="display: none;" src="app/images/GDG-X-Boomerang-snippet.png">
<!-- TODO Edit here to update your snippet for sharing. -->
<span itemprop="name" style="display: none;">GDG Space Coast - Brevard County, FL, USA.</span>
<span itemprop="description" style="display: none;">Google Developer Group (GDG) Space Coast is a technology user group that meets to discuss the latest Google Technologies, Tools, SDKs, and APIs.</span>
<img itemprop="image" style="display: none;" src="app/images/GDG-X-Boomerang-snippet.png">

<md-toolbar class="md-hue-2 navBar" ng-class="{ 'md-tall': $mdMedia('sm') }">
<div class="md-toolbar-tools">
<md-button class="md-icon-button" hide-gt-sm ng-click="$mdSidenav('left').open()" flex="none">
<md-icon>menu</md-icon>
</md-button>
<h2 hide-sm>
<span ng-cloak>{{ mc.chapterName }}</span>
</h2>
<span flex></span>
<div>
<div class="g-plusone" data-size="large"></div>
</div>
<a ng-if="mc.googlePlusLink" ng-href="{{ mc.googlePlusLink }}" rel="publisher" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-google-plus-square" aria-label="Google+"></md-icon>
</a>
<a ng-if="mc.twitterLink" ng-href="{{ mc.twitterLink }}" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-twitter-square" aria-label="Twitter"></md-icon>
</a>
<a ng-if="mc.facebookLink" ng-href="{{ mc.facebookLink }}" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-facebook-square" aria-label="Facebook"></md-icon>
</a>
<a ng-if="mc.youtubeLink" ng-href="{{ mc.youtubeLink }}" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-youtube-square" aria-label="Youtube"></md-icon>
</a>
<a ng-if="mc.meetupLink" ng-href="{{ mc.meetupLink }}" target="_blank">
<img src="app/images/icons/meetup.png" alt="Meetup" class="png-icon invert">
</a>
<a ng-if="mc.gdgLink" ng-href="{{ mc.gdgLink }}" target="_blank">
<img src="app/images/icons/GDG_square_lg.png" alt="GDG" class="png-icon gdg-icon grayscale">
</a>
</div>
<h2 class="md-toolbar-tools md-toolbar-tools-bottom" hide-gt-sm ng-cloak>
{{ mc.chapterName }}
</h2>
</md-toolbar>
<md-toolbar class="md-hue-2 navBar" ng-class="{ 'md-tall': $mdMedia('sm') }">
<div class="md-toolbar-tools">
<md-button class="md-icon-button" hide-gt-sm ng-click="$mdSidenav('left').open()" flex="none">
<md-icon>menu</md-icon>
</md-button>
<h2 hide-sm>
<span ng-cloak>{{ mc.chapterName }}</span>
</h2>
<span flex></span>
<div>
<div class="g-plusone" data-size="large"></div>
</div>
<a ng-if="mc.googlePlusLink" ng-href="{{ mc.googlePlusLink }}" rel="publisher" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-google-plus-square" aria-label="Google+"></md-icon>
</a>
<a ng-if="mc.twitterLink" ng-href="{{ mc.twitterLink }}" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-twitter-square" aria-label="Twitter"></md-icon>
</a>
<a ng-if="mc.facebookLink" ng-href="{{ mc.facebookLink }}" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-facebook-square" aria-label="Facebook"></md-icon>
</a>
<a ng-if="mc.youtubeLink" ng-href="{{ mc.youtubeLink }}" target="_blank">
<md-icon class="socialIcon" md-font-set="fa fa-lg fa-youtube-square" aria-label="Youtube"></md-icon>
</a>
<a ng-if="mc.meetupLink" ng-href="{{ mc.meetupLink }}" target="_blank">
<img src="app/images/icons/meetup.png" alt="Meetup" class="png-icon invert">
</a>
<a ng-if="mc.gdgLink" ng-href="{{ mc.gdgLink }}" target="_blank">
<img src="app/images/icons/GDG_square_lg.png" alt="GDG" class="png-icon gdg-icon grayscale">
</a>
</div>
<h2 class="md-toolbar-tools md-toolbar-tools-bottom" hide-gt-sm ng-cloak>
{{ mc.chapterName }}
</h2>
</md-toolbar>

<md-tabs class="navTabs" md-selected="mc.navTab" md-stretch-tabs="never" hide-sm>
<md-tab id="about-tab"><a class="navTabLink" href="#!/about">About</a></md-tab>
<md-tab id="news-tab"><a class="navTabLink" href="#!/news">News</a></md-tab>
<md-tab id="events-tab"><a class="navTabLink" href="#!/events">Events</a></md-tab>
<md-tab id="activities-tab"><a class="navTabLink" href="#!/activities">What We Do</a></md-tab>
<md-tab id="organizers-tab"><a class="navTabLink" href="#!/organizers">Organizers</a></md-tab>
<md-tab id="photos-tab"><a class="navTabLink" href="#!/photos">Photos</a></md-tab>
<md-tab id="conduct-tab"><a class="navTabLink" href="#!/conduct">Code of Conduct</a></md-tab>
</md-tabs>
<md-tabs class="navTabs" md-selected="mc.navTab" md-stretch-tabs="never" hide-sm>
<md-tab id="about-tab"><a class="navTabLink" href="#!/about">About</a></md-tab>
<md-tab id="news-tab"><a class="navTabLink" href="#!/news">News</a></md-tab>
<md-tab id="events-tab"><a class="navTabLink" href="#!/events">Events</a></md-tab>
<md-tab id="activities-tab"><a class="navTabLink" href="#!/activities">What We Do</a></md-tab>
<md-tab id="organizers-tab"><a class="navTabLink" href="#!/organizers">Organizers</a></md-tab>
<md-tab id="photos-tab"><a class="navTabLink" href="#!/photos">Photos</a></md-tab>
<md-tab id="conduct-tab"><a class="navTabLink" href="#!/conduct">Code of Conduct</a></md-tab>
</md-tabs>

<md-sidenav class="md-sidenav-left md-whiteframe-2dp" md-component-id="left">
<md-content>
<md-list>
<md-list-item href="#!/about" ng-click="$mdSidenav('left').close()">
About
</md-list-item>
<md-list-item href="#!/news" ng-click="$mdSidenav('left').close()">
News
</md-list-item>
<md-list-item href="#!/events" ng-click="$mdSidenav('left').close()">
Events
</md-list-item>
<md-list-item href="#!/activities" ng-click="$mdSidenav('left').close()">
What We Do
</md-list-item>
<md-list-item href="#!/organizers" ng-click="$mdSidenav('left').close()">
Organizers
</md-list-item>
<md-list-item href="#!/photos" ng-click="$mdSidenav('left').close()">
Photos
</md-list-item>
<md-list-item href="#!/conduct" ng-click="$mdSidenav('left').close()">
Code of Conduct
</md-list-item>
</md-list>
</md-content>
</md-sidenav>
<md-sidenav class="md-sidenav-left md-whiteframe-2dp" md-component-id="left">
<md-content>
<md-list>
<md-list-item href="#!/about" ng-click="$mdSidenav('left').close()">
About
</md-list-item>
<md-list-item href="#!/news" ng-click="$mdSidenav('left').close()">
News
</md-list-item>
<md-list-item href="#!/events" ng-click="$mdSidenav('left').close()">
Events
</md-list-item>
<md-list-item href="#!/activities" ng-click="$mdSidenav('left').close()">
What We Do
</md-list-item>
<md-list-item href="#!/organizers" ng-click="$mdSidenav('left').close()">
Organizers
</md-list-item>
<md-list-item href="#!/photos" ng-click="$mdSidenav('left').close()">
Photos
</md-list-item>
<md-list-item href="#!/conduct" ng-click="$mdSidenav('left').close()">
Code of Conduct
</md-list-item>
</md-list>
</md-content>
</md-sidenav>

<div layout layout-align="center start" ng-style="{ 'margin': $mdMedia('gt-md') ? '8px' : '0' }">
<div ng-view flex-sm="100" flex-md="100" flex-lg="90" flex-gt-lg="85"></div>
</div>
</body>
<script src="https://apis.google.com/js/platform.js" async defer></script>
<!-- bower:js -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-aria.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-route.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.0/angular-sanitize.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.5/angular-material.min.js"></script>
<!-- endinject -->
<!-- inject:js -->
<script src="app/dist/boomerang.min.js"></script>
<!-- endinject -->
<div layout layout-align="center start" ng-style="{ 'margin': $mdMedia('gt-md') ? '8px' : '0' }">
<div ng-view flex-sm="100" flex-md="100" flex-lg="90" flex-gt-lg="85"></div>
</div>
</body>
<script src="https://apis.google.com/js/platform.js" async defer></script>
<!-- bower:js -->
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-animate.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-aria.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-route.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.6/angular-sanitize.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.0.5/angular-material.min.js"></script>
<!-- endinject -->
<!-- inject:js -->
<script src="app/dist/boomerang.min.js"></script>
<!-- endinject -->
</html>
23 changes: 12 additions & 11 deletions package.json
Expand Up @@ -30,7 +30,7 @@
},
"homepage": "https://github.com/gdg-x/boomerang",
"devDependencies": {
"bower": "1.7.7",
"bower": "1.7.9",
"browserify": "12.0.1",
"del": "0.1.3",
"gulp": "3.9.1",
Expand All @@ -43,16 +43,17 @@
"gulp-ng-annotate": "1.1.0",
"gulp-sourcemaps": "1.2.8",
"gulp-uglify": "1.5.1",
"jasmine-core": "2.2.0",
"karma": "0.13.21",
"karma-chrome-launcher": "0.2.1",
"karma-firefox-launcher": "0.1.7",
"karma-jasmine": "0.3.5",
"karma-phantomjs-launcher": "0.2.1",
"karma-safari-launcher": "0.1.1",
"main-bower-files": "2.7.0",
"protractor": "2.0.0",
"jasmine-core": "2.4.1",
"karma": "0.13.22",
"karma-chrome-launcher": "1.0.1",
"karma-firefox-launcher": "1.0.0",
"karma-jasmine": "1.0.2",
"karma-phantomjs-launcher": "1.0.0",
"karma-safari-launcher": "1.0.0",
"main-bower-files": "2.13.1",
"phantomjs-prebuilt": "2.1.7",
"protractor": "3.3.0",
"vinyl-buffer": "1.0.0",
"vinyl-source-stream": "1.0.0"
"vinyl-source-stream": "1.1.0"
}
}

0 comments on commit a365c2a

Please sign in to comment.