angular · jelbourn · Oct 1, 2018 · Sep 24, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,12 @@
 language: node_js
+dist: trusty
+addons:
+  chrome: stable
+  firefox: latest
 sudo: false
 
 node_js:
-  - '8'
+  - '10'
 
 env:
   global:
@@ -13,10 +17,12 @@ env:
   - BROWSER_STACK_USERNAME=angularteam1
   - BROWSER_STACK_ACCESS_KEY=BWCd4SynLzdDcv8xtzsB
   - secure: X7CNmOMemAJ9Jqrsmv6MXyeh8n8TIL5CKzE9LYsZUbsyKo0l5CyyysJq0y/AbpQS6awsSv2qP/cZ/kand6r6z0wMFbUcxa4HjMZEfRwv3sGtwj1OKJko/GvjcZQzD54FtHy1NU7wR0mYhAlE5IwH7f8bMa/nUiijgD/TOCTtKH8=
+  - MOZ_HEADLESS=1
 
 cache:
   directories:
   - node_modules/
+  - "$HOME/.npm"
   - tmp/angular.js
 
 branches:
@@ -35,7 +41,7 @@ jobs:
       env: "MODE=release"
 
 install:
-- npm install
+- npm ci
 - npm rebuild node-sass
 
 before_script:

diff --git a/README.md b/README.md
@@ -53,9 +53,9 @@ We have three types of releases:
 
 ##### Patch Releases
 
-The patch builds (1.1.4, 1.1.5, 1.1.6) are prepared based on commits in the `master` branch; which contains only
-non-breaking changes (I.e. bug fixes, new features, API additions, and minimal non-breaking CSS changes). 
-We are targeting `patch` releases every 2 weeks.
+The patch builds (1.1.8, 1.1.9, 1.1.10, etc.) are prepared based on commits in the `master` branch;
+which contains only non-breaking changes (I.e. bug fixes, new features, API additions, and minimal
+non-breaking CSS changes). We are targeting `patch` releases every 2 weeks.
 
 ##### Minor Releases
 
@@ -163,13 +163,13 @@ when using online tools such as [CodePen](http://codepen.io/), [Plunkr](http://p
   <body>
 
     <!-- AngularJS Material Dependencies -->
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular.min.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-animate.min.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-aria.min.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.7/angular-messages.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-animate.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-aria.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-messages.min.js"></script>
 
-    <!-- AngularJS Material Javascript now available via Google CDN; version 1.1.4 used here -->
-    <script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.9/angular-material.min.js"></script>
+    <!-- AngularJS Material Javascript now available via Google CDN; version 1.1.10 used here -->
+    <script src="https://ajax.googleapis.com/ajax/libs/angular_material/1.1.10/angular-material.min.js"></script>
   </body>
 ```
 
@@ -187,10 +187,10 @@ pull directly from the distribution GitHub
   <body>
 
     <!-- AngularJS Material Dependencies -->
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular-animate.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular-aria.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.6.9/angular-messages.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-animate.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-aria.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.7.4/angular-messages.min.js"></script>
 
     <!-- AngularJS Material Javascript using GitCDN to load directly from `bower-material/master` -->
     <script src="https://cdn.gitcdn.link/cdn/angular/bower-material/master/angular-material.js"></script>

diff --git a/config/build.config.js b/config/build.config.js
@@ -1,7 +1,7 @@
 const pkg = require('../package.json');
 
 module.exports = {
-  ngVersion: '1.7.2',
+  ngVersion: '1.7.4',
   version: pkg.version,
   repository: pkg.repository.url
     .replace(/^git/,'https')

diff --git a/config/karma-ci.conf.js → config/karma-jenkins.conf.js b/config/karma-ci.conf.js → config/karma-jenkins.conf.js
@@ -18,19 +18,6 @@ module.exports = function(config) {
     client: {
       // Do not clear the context as this can cause reload failures with Jasmine
       clearContext: false
-    },
-
-    // This is the new content for your travis-ci configuration test
-    //  Custom launcher for Travis-CI
-    customLaunchers: {
-        Chrome_travis_ci: {
-            base: 'Chrome',
-            flags: ['--no-sandbox']
-        }
     }
   });
-
-  const browsers = process.env.TRAVIS ? ['Chrome_travis_ci'] : [];
-  config.browsers = browsers.concat(config.browsers);
-
 };
diff --git a/config/karma-travis.conf.js b/config/karma-travis.conf.js
@@ -0,0 +1,27 @@
+const baseKarma = require('./karma.conf.js');
+
+module.exports = function(config) {
+  baseKarma(config);
+
+  // Override defaults with custom CI settings
+  config.set({
+    colors: false,
+
+    browsers: ['ChromeHeadlessNoSandbox', 'FirefoxHeadless'],
+    customLaunchers: {
+      ChromeHeadlessNoSandbox: {
+        base: 'ChromeHeadless',
+        flags: ['--no-sandbox']
+      },
+      FirefoxHeadless: {
+        base: 'Firefox',
+        flags: ['-headless'],
+      },
+    },
+
+    client: {
+      // Do not clear the context as this can cause reload failures with Jasmine
+      clearContext: false
+    }
+  });
+};
diff --git a/config/karma.conf.js b/config/karma.conf.js
@@ -1,13 +1,11 @@
-const sauceBrowsers = require('./sauce-browsers.json');
 const path = require('path');
 
 module.exports = function(config) {
 
   const UNCOMPILED_SRC = [
 
-    // To enabled use of `gulp karma-watch`,
-    // don't use the dist/angular-material.js
-    //
+    // To enable use of `gulp karma-watch`,
+    // don't use the dist/angular-material.js.
     //'dist/angular-material.js',   // Un-minified source
 
 
@@ -47,13 +45,16 @@ module.exports = function(config) {
   const testSrc = process.env.KARMA_TEST_COMPRESSED ? COMPILED_SRC : UNCOMPILED_SRC;
 
   config.set({
-
     basePath: path.join(__dirname, '/..'),
+    plugins: [
+      require("karma-jasmine"),
+      require("karma-chrome-launcher"),
+      require('karma-firefox-launcher')
+    ],
     frameworks: ['jasmine'],
     files: dependencies.concat(testSrc),
-    customLaunchers: sauceBrowsers,
 
-    browserDisconnectTimeout:500,
+    browserDisconnectTimeout: 500,
 
     logLevel: config.LOG_DEBUG,
     port: 9876,
@@ -80,5 +81,4 @@ module.exports = function(config) {
       clearContext:false
     }
   });
-
 };
diff --git a/package-lock.json b/package-lock.json