Changed the Java compiler target to be Java11 [#761]

Additionally modified the code formatting for the web project to use the project's instance of Prettier.
comixed · Jun 6, 2021 · 7656be7 · 7656be7
1 parent e380095
commit 7656be7
Show file tree

Hide file tree

Showing 39 changed files with 152 additions and 144 deletions.
diff --git a/comixed-web/package.json b/comixed-web/package.json
@@ -8,7 +8,7 @@
     "test": "ng test --code-coverage",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "format": "prettier --write 'src/app/**/*.{ts,json,html,scss}'"
+    "format": "node_modules/.bin/prettier --write 'src/app/**/*.{ts,json,html,scss}'"
   },
   "prettier": {
     "singleQuote": true,
@@ -93,6 +93,7 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~3.3.0",
     "karma-jasmine-html-reporter": "^1.5.4",
+    "prettier": "^2.3.1",
     "protractor": "~7.0.0",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",

diff --git a/comixed-web/src/app/admin/pages/web-audit-log/web-audit-log.component.spec.ts b/comixed-web/src/app/admin/pages/web-audit-log/web-audit-log.component.spec.ts
@@ -165,10 +165,9 @@ describe('WebAuditLogComponent', () => {
 
   describe('clearing the audit log', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.onClearLog();
     });
 

diff --git a/comixed-web/src/app/app.component.html b/comixed-web/src/app/app.component.html
@@ -31,7 +31,13 @@
 
   <div
     id="cx-footer"
-    class="cx-width-100 cx-padding-left-15 cx-padding-right-15 cx-padding-top-5 cx-padding-bottom-5"
+    class="
+      cx-width-100
+      cx-padding-left-15
+      cx-padding-right-15
+      cx-padding-top-5
+      cx-padding-bottom-5
+    "
   >
     <cx-footer [user]="user"></cx-footer>
   </div>

diff --git a/...p/blocked-pages/pages/blocked-page-detail-page/blocked-page-detail-page.component.spec.ts b/...p/blocked-pages/pages/blocked-page-detail-page/blocked-page-detail-page.component.spec.ts
@@ -164,10 +164,9 @@ describe('BlockedPageDetailPageComponent', () => {
 
   describe('saving the blocked page', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.blockedPage = ENTRY;
       component.onSave();
     });
@@ -185,10 +184,9 @@ describe('BlockedPageDetailPageComponent', () => {
 
   describe('resetting the form', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.blockedPage = ENTRY;
       component.editing = true;
       component.blockedPageForm.controls.label.setValue(ENTRY.label.substr(1));

diff --git a/...c/app/blocked-pages/pages/blocked-page-list-page/blocked-page-list-page.component.spec.ts b/...c/app/blocked-pages/pages/blocked-page-list-page/blocked-page-list-page.component.spec.ts
@@ -195,10 +195,9 @@ describe('BlockedPageListPageComponent', () => {
 
     beforeEach(() => {
       component.showUploadRow = true;
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.onFileSelected(EVENT);
     });
 
@@ -228,10 +227,9 @@ describe('BlockedPageListPageComponent', () => {
       });
       component.dataSource.data.forEach(entry => (entry.selected = false));
       component.dataSource.data[0].selected = true;
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.onDeleteEntries();
     });
 

diff --git a/comixed-web/src/app/blocked-pages/selectors/blocked-page-detail.selectors.ts b/comixed-web/src/app/blocked-pages/selectors/blocked-page-detail.selectors.ts
@@ -23,9 +23,10 @@ import {
 } from '../reducers/blocked-page-detail.reducer';
 
 /** Loads the blocked page detail feature state. */
-export const selectBlockedPageDetailState = createFeatureSelector<BlockedPageDetailState>(
-  BLOCKED_PAGE_DETAIL_FEATURE_KEY
-);
+export const selectBlockedPageDetailState =
+  createFeatureSelector<BlockedPageDetailState>(
+    BLOCKED_PAGE_DETAIL_FEATURE_KEY
+  );
 
 export const selectBlockedPageDetail = createSelector(
   selectBlockedPageDetailState,

diff --git a/comixed-web/src/app/blocked-pages/selectors/blocked-page-list.selectors.ts b/comixed-web/src/app/blocked-pages/selectors/blocked-page-list.selectors.ts
@@ -25,9 +25,8 @@ import {
 /**
  * Selects the blocked page list feature state.
  */
-export const selectBlockedPageListState = createFeatureSelector<BlockedPageListState>(
-  BLOCKED_PAGE_LIST_FEATURE_KEY
-);
+export const selectBlockedPageListState =
+  createFeatureSelector<BlockedPageListState>(BLOCKED_PAGE_LIST_FEATURE_KEY);
 
 /**
  * Selects the list of blocked pages.

diff --git a/comixed-web/src/app/blocked-pages/selectors/delete-blocked-pages.selectors.ts b/comixed-web/src/app/blocked-pages/selectors/delete-blocked-pages.selectors.ts
@@ -22,6 +22,7 @@ import {
   DeleteBlockedPagesState
 } from '../reducers/delete-blocked-pages.reducer';
 
-export const selectDeleteBlockedPagesState = createFeatureSelector<DeleteBlockedPagesState>(
-  DELETE_BLOCKED_PAGES_FEATURE_KEY
-);
+export const selectDeleteBlockedPagesState =
+  createFeatureSelector<DeleteBlockedPagesState>(
+    DELETE_BLOCKED_PAGES_FEATURE_KEY
+  );
diff --git a/comixed-web/src/app/blocked-pages/selectors/download-blocked-pages.selectors.ts b/comixed-web/src/app/blocked-pages/selectors/download-blocked-pages.selectors.ts
@@ -22,6 +22,7 @@ import {
   DownloadBlockedPagesState
 } from '../reducers/download-blocked-pages.reducer';
 
-export const selectDownloadBlockedPagesState = createFeatureSelector<DownloadBlockedPagesState>(
-  DOWNLOAD_BLOCKED_PAGES_FEATURE_KEY
-);
+export const selectDownloadBlockedPagesState =
+  createFeatureSelector<DownloadBlockedPagesState>(
+    DOWNLOAD_BLOCKED_PAGES_FEATURE_KEY
+  );
diff --git a/comixed-web/src/app/blocked-pages/selectors/upload-blocked-pages.selectors.ts b/comixed-web/src/app/blocked-pages/selectors/upload-blocked-pages.selectors.ts
@@ -22,6 +22,7 @@ import {
   UploadedBlockedPagesState
 } from '../reducers/upload-blocked-pages.reducer';
 
-export const selectUploadBlockedPagesState = createFeatureSelector<UploadedBlockedPagesState>(
-  UPLOAD_BLOCKED_PAGES_FEATURE_KEY
-);
+export const selectUploadBlockedPagesState =
+  createFeatureSelector<UploadedBlockedPagesState>(
+    UPLOAD_BLOCKED_PAGES_FEATURE_KEY
+  );
diff --git a/comixed-web/src/app/collections/pages/collection-list/collection-list.component.ts b/comixed-web/src/app/collections/pages/collection-list/collection-list.component.ts
@@ -42,7 +42,8 @@ import { MatSort } from '@angular/material/sort';
   styleUrls: ['./collection-list.component.scss']
 })
 export class CollectionListComponent
-  implements OnInit, OnDestroy, AfterViewInit {
+  implements OnInit, OnDestroy, AfterViewInit
+{
   @ViewChild(MatSort) matSort: MatSort;
 
   typeSubscription: Subscription;

diff --git a/comixed-web/src/app/comic-book/components/comic-edit/comic-edit.component.spec.ts b/comixed-web/src/app/comic-book/components/comic-edit/comic-edit.component.spec.ts
@@ -102,10 +102,9 @@ describe('ComicEditComponent', () => {
 
   describe('undoing changes', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.onUndoChanges();
     });
 
@@ -189,10 +188,9 @@ describe('ComicEditComponent', () => {
 
   describe('saving changes', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.comic = COMIC;
       component.onSaveChanges();
     });

diff --git a/comixed-web/src/app/comic-book/components/comic-scraping/comic-scraping.component.spec.ts b/comixed-web/src/app/comic-book/components/comic-scraping/comic-scraping.component.spec.ts
@@ -206,10 +206,9 @@ describe('ComicScrapingComponent', () => {
 
     describe('when selected', () => {
       beforeEach(() => {
-        spyOn(
-          confirmationService,
-          'confirm'
-        ).and.callFake((confirm: Confirmation) => confirm.confirm());
+        spyOn(confirmationService, 'confirm').and.callFake(
+          (confirm: Confirmation) => confirm.confirm()
+        );
         component.onDecision(true);
       });
 

diff --git a/comixed-web/src/app/comic-book/components/comic-scraping/comic-scraping.component.ts b/comixed-web/src/app/comic-book/components/comic-scraping/comic-scraping.component.ts
@@ -64,7 +64,8 @@ export const NO_MATCH_TEXT = 'scraping.text.no-match';
   styleUrls: ['./comic-scraping.component.scss']
 })
 export class ComicScrapingComponent
-  implements OnInit, OnDestroy, AfterViewInit {
+  implements OnInit, OnDestroy, AfterViewInit
+{
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 

diff --git a/comixed-web/src/app/comic-book/pages/comic-book-page/comic-book-page.component.spec.ts b/comixed-web/src/app/comic-book/pages/comic-book-page/comic-book-page.component.spec.ts
@@ -291,10 +291,9 @@ describe('ComicBookPageComponent', () => {
   describe('updating the comic info', () => {
     beforeEach(() => {
       component.comic = COMIC;
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.onUpdateComicInfo();
     });
 

diff --git a/comixed-web/src/app/comic-book/pages/comic-book-page/comic-book-page.component.ts b/comixed-web/src/app/comic-book/pages/comic-book-page/comic-book-page.component.ts
@@ -63,7 +63,8 @@ import { updateComicInfo } from '@app/comic-book/actions/update-comic-info.actio
   styleUrls: ['./comic-book-page.component.scss']
 })
 export class ComicBookPageComponent
-  implements OnInit, OnDestroy, AfterViewInit {
+  implements OnInit, OnDestroy, AfterViewInit
+{
   paramSubscription: Subscription;
   queryParamSubscription: Subscription;
   currentTab = 0;

diff --git a/comixed-web/src/app/comic-book/selectors/comic.selectors.ts b/comixed-web/src/app/comic-book/selectors/comic.selectors.ts
@@ -19,9 +19,8 @@
 import { createFeatureSelector, createSelector } from '@ngrx/store';
 import { COMIC_FEATURE_KEY, ComicState } from '../reducers/comic.reducer';
 
-export const selectComicState = createFeatureSelector<ComicState>(
-  COMIC_FEATURE_KEY
-);
+export const selectComicState =
+  createFeatureSelector<ComicState>(COMIC_FEATURE_KEY);
 
 export const selectComic = createSelector(
   selectComicState,

diff --git a/comixed-web/src/app/comic-book/selectors/scraping.selectors.ts b/comixed-web/src/app/comic-book/selectors/scraping.selectors.ts
@@ -23,9 +23,8 @@ import {
 } from '../reducers/scraping.reducer';
 
 /** Selects for the feature state. */
-export const selectScrapingState = createFeatureSelector<ScrapingState>(
-  SCRAPING_FEATURE_KEY
-);
+export const selectScrapingState =
+  createFeatureSelector<ScrapingState>(SCRAPING_FEATURE_KEY);
 
 /** Selects for the scraping volumes. */
 export const selectScrapingVolumes = createSelector(

diff --git a/comixed-web/src/app/comic-book/selectors/update-comic-info.selectors.ts b/comixed-web/src/app/comic-book/selectors/update-comic-info.selectors.ts
@@ -22,6 +22,5 @@ import {
   UpdateComicInfoState
 } from '../reducers/update-comic-info.reducer';
 
-export const selectUpdateComicInfoState = createFeatureSelector<UpdateComicInfoState>(
-  UPDATE_COMIC_INFO_FEATURE_KEY
-);
+export const selectUpdateComicInfoState =
+  createFeatureSelector<UpdateComicInfoState>(UPDATE_COMIC_INFO_FEATURE_KEY);
diff --git a/comixed-web/src/app/comic-file/pages/import-comics-page/import-comics-page.component.spec.ts b/comixed-web/src/app/comic-file/pages/import-comics-page/import-comics-page.component.spec.ts
@@ -299,10 +299,9 @@ describe('ImportComicsPageComponent', () => {
       component.ignoreMetadata = IGNORE_METADATA;
       component.deleteBlockedPages = DELETE_BLOCKED_PAGES;
 
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirm: Confirmation) => confirm.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirm: Confirmation) => confirm.confirm()
+      );
       component.onStartImport();
     });
 

diff --git a/comixed-web/src/app/comic-file/selectors/comic-file-list.selectors.ts b/comixed-web/src/app/comic-file/selectors/comic-file-list.selectors.ts
@@ -24,9 +24,8 @@ import {
 import { selectComicImportState } from '@app/comic-file/selectors/comic-import.selectors';
 
 /** Selects the comic list feature state. */
-export const selectComicFileListState = createFeatureSelector<ComicFileListState>(
-  COMIC_FILE_LIST_FEATURE_KEY
-);
+export const selectComicFileListState =
+  createFeatureSelector<ComicFileListState>(COMIC_FILE_LIST_FEATURE_KEY);
 
 /** Selects the loaded comic files. */
 export const selectComicFiles = createSelector(

diff --git a/comixed-web/src/app/comic-file/selectors/import-comic-files.selectors.ts b/comixed-web/src/app/comic-file/selectors/import-comic-files.selectors.ts
@@ -23,6 +23,5 @@ import {
 import { createFeatureSelector } from '@ngrx/store';
 
 /** Selects the comic import feature state. */
-export const selectImportComicFilesState = createFeatureSelector<ImportComicFilesState>(
-  IMPORT_COMIC_FILES_FEATURE_KEY
-);
+export const selectImportComicFilesState =
+  createFeatureSelector<ImportComicFilesState>(IMPORT_COMIC_FILES_FEATURE_KEY);
diff --git a/comixed-web/src/app/components/navigation-bar/navigation-bar.component.spec.ts b/comixed-web/src/app/components/navigation-bar/navigation-bar.component.spec.ts
@@ -135,10 +135,9 @@ describe('NavigationBarComponent', () => {
 
   describe('on logout clicked', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirm: Confirmation) => confirm.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirm: Confirmation) => confirm.confirm()
+      );
       component.onLogout();
     });
 

diff --git a/comixed-web/src/app/core/selectors/busy.selectors.ts b/comixed-web/src/app/core/selectors/busy.selectors.ts
@@ -19,6 +19,5 @@
 import { createFeatureSelector } from '@ngrx/store';
 import { BUSY_FEATURE_KEY, BusyState } from '../reducers/busy.reducer';
 
-export const selectBusyState = createFeatureSelector<BusyState>(
-  BUSY_FEATURE_KEY
-);
+export const selectBusyState =
+  createFeatureSelector<BusyState>(BUSY_FEATURE_KEY);
diff --git a/comixed-web/src/app/last-read/selectors/update-read-status.selectors.ts b/comixed-web/src/app/last-read/selectors/update-read-status.selectors.ts
@@ -22,6 +22,5 @@ import {
   UpdateReadStatusState
 } from '../reducers/update-read-status.reducer';
 
-export const selectMarkComicReadState = createFeatureSelector<UpdateReadStatusState>(
-  UPDATE_READ_STATUS_FEATURE_KEY
-);
+export const selectMarkComicReadState =
+  createFeatureSelector<UpdateReadStatusState>(UPDATE_READ_STATUS_FEATURE_KEY);
diff --git a/comixed-web/src/app/library/components/comic-covers/comic-covers.component.spec.ts b/comixed-web/src/app/library/components/comic-covers/comic-covers.component.spec.ts
@@ -259,10 +259,9 @@ describe('ComicCoversComponent', () => {
 
   describe('updating the comic info', () => {
     beforeEach(() => {
-      spyOn(
-        confirmationService,
-        'confirm'
-      ).and.callFake((confirmation: Confirmation) => confirmation.confirm());
+      spyOn(confirmationService, 'confirm').and.callFake(
+        (confirmation: Confirmation) => confirmation.confirm()
+      );
       component.onUpdateComicInfo(COMIC);
     });