Skip to content

Commit

Permalink
Merge branch 'release/v0.7.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
musicEnfanthen committed May 14, 2021
2 parents b680fbe + 2eac205 commit 2cf64fe
Show file tree
Hide file tree
Showing 9 changed files with 1,045 additions and 1,274 deletions.
2 changes: 1 addition & 1 deletion .codecov.yml → .github/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ codecov:
coverage:
precision: 2
round: down
range: '70...100'
range: '50...100'

status:
project:
Expand Down
8 changes: 6 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ updates:
directory: '/'
schedule:
interval: 'daily'
target_branch: 'develop'
target-branch: 'develop'
labels:
- 'gh actions dependencies'

# Maintain dependencies for yarn
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'daily'
target_branch: 'develop'
target-branch: 'develop'
labels:
- 'npm dependencies'
3 changes: 2 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
. "$(dirname "$0")/_/husky.sh"

# cf. https://typicode.github.io/husky/#/?id=package-scripts
yarn run-s -l lint-staged format:fix-staged
yarn run lint-staged
yarn run format:fix-staged
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,23 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [0.7.14](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.13...v0.7.14) (2021-05-14)

### Tests

- **app:** add codecov reporter ([9ea16d4](https://github.com/webern-unibas-ch/awg-app/commit/9ea16d4b6c7ff19d7e0a99d81630e51a4fb62020))
- **app:** add codecov reporter ([955738f](https://github.com/webern-unibas-ch/awg-app/commit/955738fbc3977215e56e2483f25e26ebe4f3f9ba))

### Continuous Integration

- **gh-actions:** fix syntax for dependabot.yml ([3ebdee3](https://github.com/webern-unibas-ch/awg-app/commit/3ebdee30f14dbb0d049b756e1152d8657b302dfb))

### Build System

- **deps:** remove unused npm-run-all ([f6edf0b](https://github.com/webern-unibas-ch/awg-app/commit/f6edf0bb1771bc542a46e7bb1a30ba11518c782c))
- **deps:** update dependencies ([d873eed](https://github.com/webern-unibas-ch/awg-app/commit/d873eed87209dec5b5c8ded09d29083cb2b3fa58))
- **deps:** update dependencies ([0d038a6](https://github.com/webern-unibas-ch/awg-app/commit/0d038a63e32483531967ed9ad623efcf68e1cabe))

### [0.7.13](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.12...v0.7.13) (2021-04-25)

### Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = function (config) {
coverageReporter: {
dir: require('path').join(__dirname, './coverage/'),
subdir: '.',
reporters: [{ type: 'html' }, { type: 'text-summary' }],
reporters: [{ type: 'html' }, { type: 'text-summary' }, { type: 'lcovonly' }],
},
reporters: ['progress', 'kjhtml'],
customLaunchers: {
Expand Down
67 changes: 33 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "awg-app",
"version": "0.7.13",
"version": "0.7.14",
"license": "MIT",
"author": {
"name": "Stefan Münnich",
Expand Down Expand Up @@ -118,32 +118,32 @@
]
},
"dependencies": {
"@angular/animations": "~11.2.7",
"@angular/common": "~11.2.7",
"@angular/compiler": "~11.2.7",
"@angular/core": "~11.2.7",
"@angular/animations": "~11.2.12",
"@angular/common": "~11.2.12",
"@angular/compiler": "~11.2.12",
"@angular/core": "~11.2.12",
"@angular/forms": "~11.2.7",
"@angular/localize": "11.2.7",
"@angular/platform-browser": "~11.2.7",
"@angular/platform-browser-dynamic": "~11.2.7",
"@angular/platform-server": "~11.2.7",
"@angular/router": "~11.2.7",
"@ctrl/ngx-codemirror": "^4.1.0",
"@angular/localize": "11.2.12",
"@angular/platform-browser": "~11.2.12",
"@angular/platform-browser-dynamic": "~11.2.12",
"@angular/platform-server": "~11.2.12",
"@angular/router": "~11.2.12",
"@ctrl/ngx-codemirror": "^4.1.1",
"@fortawesome/angular-fontawesome": "^0.8.2",
"@fortawesome/fontawesome-svg-core": "^1.2.35",
"@fortawesome/free-solid-svg-icons": "^5.15.3",
"@kolkov/ngx-gallery": "^1.2.3",
"@ng-bootstrap/ng-bootstrap": "^9.1.0",
"bootstrap": "^4.6.0",
"codemirror": "^5.60.0",
"codemirror": "^5.61.0",
"core-js": "^3.6.5",
"d3-drag": "^2.0.0",
"d3-force": "^2.1.1",
"d3-selection": "^2.0.0",
"d3-zoom": "^2.0.0",
"font-awesome": "^4.7.0",
"json2typescript": "^1.4.1",
"n3": "^1.9.0",
"n3": "^1.10.0",
"ngx-json-viewer": "^3.0.2",
"rdfstore": "^0.9.17",
"rxjs": "~6.6.0",
Expand All @@ -152,51 +152,50 @@
"zone.js": "~0.11.3"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1102.6",
"@angular-eslint/builder": "4.0.0",
"@angular-eslint/eslint-plugin": "4.0.0",
"@angular-eslint/eslint-plugin-template": "4.0.0",
"@angular-eslint/schematics": "4.0.0",
"@angular-eslint/template-parser": "4.0.0",
"@angular/cli": "~11.2.6",
"@angular/compiler-cli": "~11.2.7",
"@commitlint/cli": "^12.0.1",
"@commitlint/config-angular": "^12.0.1",
"@angular-devkit/build-angular": "~0.1102.11",
"@angular-eslint/builder": "4.2.0",
"@angular-eslint/eslint-plugin": "4.2.0",
"@angular-eslint/eslint-plugin-template": "4.2.0",
"@angular-eslint/schematics": "4.2.0",
"@angular-eslint/template-parser": "4.2.0",
"@angular/cli": "~11.2.11",
"@angular/compiler-cli": "~11.2.12",
"@commitlint/cli": "^12.1.1",
"@commitlint/config-angular": "^12.1.1",
"@compodoc/compodoc": "^1.1.11",
"@types/d3": "^6.3.0",
"@types/jasmine": "~3.6.0",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "^4.16.1",
"@typescript-eslint/parser": "^4.16.1",
"@types/node": "^15.0.1",
"@typescript-eslint/eslint-plugin": "^4.22.0",
"@typescript-eslint/parser": "^4.22.0",
"angular-cli-ghpages": "^1.0.0-rc.1",
"conventional-recommended-bump": "^6.1.0",
"cross-var": "^1.1.0",
"eslint": "^7.6.0",
"eslint-config-prettier": "^8.1.0",
"eslint": "^7.25.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-angular": "^4.0.1",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-jsdoc": "^32.2.0",
"eslint-plugin-jsdoc": "^32.3.3",
"eslint-plugin-prettier": "^3.4.0",
"gzipper": "^4.4.0",
"gzipper": "^4.5.0",
"husky": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~6.1.0",
"karma": "~6.3.2",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "^2.0.3",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"karma-jasmine-html-reporter": "^1.5.4",
"lint-staged": "^10.5.4",
"npm-run-all": "^4.1.5",
"prettier": "^2.2.1",
"pretty-quick": "^3.1.0",
"protractor": "~7.0.0",
"source-map-explorer": "^2.5.2",
"standard-version": "^9.1.1",
"ts-node": "~8.3.0",
"typescript": "~4.1.5",
"webpack-bundle-analyzer": "^4.4.0"
"webpack-bundle-analyzer": "^4.4.1"
},
"engines": {
"node": ">= 10.21.0",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
import { TestBed, ComponentFixture, waitForAsync, fakeAsync, tick } from '@angular/core/testing';
import { TestBed, ComponentFixture, waitForAsync } from '@angular/core/testing';
import { Component, DebugElement, NgZone } from '@angular/core';
import { Location } from '@angular/common';
import { Router, Routes } from '@angular/router';
Expand Down
6 changes: 3 additions & 3 deletions src/app/app.globals.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY!
// Generated last time on Sun Apr 25 17:11:25 2021
// Generated last time on Fri May 14 10:57:19 2021

/**
* The latest version of the AWG App
*/
export const appVersion = '0.7.13';
export const appVersion = '0.7.14';

/**
* The release date of the latest version of the AWG App
*/
export const appVersionReleaseDate = '25. April 2021';
export const appVersionReleaseDate = '14. Mai 2021';

/**
* The URL of the AWG App
Expand Down
Loading

0 comments on commit 2cf64fe

Please sign in to comment.