Merge remote-tracking branch 'origin/main' into refactor/2318/rework-…

…custom-dispatch

.github/workflows/release_gh_pages.yml

@@ -25,10 +25,10 @@ jobs:
           node-version: '16'
 
       - name: Install wine
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt update
-          sudo apt-get install -y wine-stable wine32 libwine:i386
+        run: sudo apt-get install -y wine-stable
+
+      - name: Install zip
+        run: sudo apt-get install -y zip
 
       - name: Build analysis
         working-directory: ./analysis
@@ -39,7 +39,6 @@ jobs:
       - name: Build visualization
         working-directory: ./visualization
         run: |
-          rm -rf node_modules/nwjs-builder-phoenix/caches/*
           npm ci
           npm run test
           npm run build

CHANGELOG.md

@@ -7,34 +7,33 @@ and this project adheres to [Semantic Versioning](http://semver.org/)
 
 ## [unreleased] (Added 🚀 | Changed | Removed 🗑 | Fixed 🐞 | Chore 👨‍💻 👩‍💻)
 
-## Changed
+### Changed
 
--   Select matching metric combination based on available metrics [#2862](https://github.com/MaibornWolff/codecharta/pull/2862)
 -   Rework internal camera handling [#2880](https://github.com/MaibornWolff/codecharta/pull/2880). As a consequence there is an internal wrapper needed for existing metric templates and custom views, which will be removed on 01.01.2023. Afterwards previously saved metric templates and custom views will not be applicable anymore.
 
+## [1.100.0] - 2022-07-12
+
 ### Added 🚀
 
 -   Add a description for the statements metric [#2883](https://github.com/MaibornWolff/codecharta/pull/2883)
 
+### Changed
+
+-   Select matching metric combination based on available metrics [#2862](https://github.com/MaibornWolff/codecharta/pull/2862)
+-   Unify UI of buttons in toolbar [#2857](https://github.com/MaibornWolff/codecharta/pull/2857)
+
 ### Fixed 🐞
 
 -   Fix resetting of color range within color settings panel [#2877](https://github.com/MaibornWolff/codecharta/pull/2877)
 -   Fix resetting of colors in delta mode within color settings panel [#2873](https://github.com/MaibornWolff/codecharta/pull/2873)
 -   Restore global settings on page load again [#2878](https://github.com/MaibornWolff/codecharta/pull/2878)
 -   Fix 'undefinded' being displayed as a metric description when no description was available [#2883](https://github.com/MaibornWolff/codecharta/pull/2883)
+-   Fix windows standalone builds [#2881](https://github.com/MaibornWolff/codecharta/pull/2881)
 
 ### Chore 👨‍💻 👩‍💻
 
 -   Migrate color settings panel to Angular [#2873](https://github.com/MaibornWolff/codecharta/pull/2873)
 
-## [1.99.3] - 2022-06-28
-
-## [1.99.2] - 2022-06-28
-
-### Changed
-
--   Unify UI of buttons in toolbar [#2857](https://github.com/MaibornWolff/codecharta/pull/2857)
-
 ## [1.99.1] - 2022-06-22
 
 ### Fixed 🐞

analysis/build.gradle

@@ -13,7 +13,7 @@ buildscript {
         json_version = '20190722'
         juniversalchardet_version = '1.0.3'
         kotlin_logging_version = '2.1.23'
-        kotlin_version = '1.7.0'
+        kotlin_version = '1.7.10'
         kotlinx_coroutines_version = '1.6.3'
         picocli_version = '4.6.3'
         slf4j_version = '1.7.36'
@@ -36,7 +36,7 @@ buildscript {
         mockk_version = '1.12.4'
         spek2_version = '2.0.18'
         wiremock_version = '2.33.2'
-        jsonassert_version = '1.5.0'
+        jsonassert_version = '1.5.1'
     }
 
     repositories {

analysis/gradle.properties

@@ -1,5 +1,5 @@
 # Project-wide Gradle settings.
-currentVersion=1.99.3
+currentVersion=1.100.0
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

analysis/node-wrapper/package.json

@@ -10,7 +10,7 @@
 		"url": "https://github.com/MaibornWolff/codecharta.git"
 	},
 	"name": "codecharta-analysis",
-	"version": "1.99.3",
+	"version": "1.100.0",
 	"description": "MaibornWolff CodeCharta Analysis Tools",
 	"scripts": {
 		"prepare": "rm -rf ../build/install/codecharta-analysis public && ../gradlew -p .. installDist && cp -R ../build/install/codecharta-analysis public"

gh-pages/_posts/release/2022-07-12-v1_100_0.md

@@ -0,0 +1,31 @@
+---
+categories:
+    - Release
+tags:
+    - gh-pages
+
+title: 1.100.0
+---
+
+{{page.title}} is live and ready for [download](https://github.com/MaibornWolff/codecharta/releases/tag/{{page.title}}). This version brings the following:
+
+### Added 🚀
+
+-   Add a description for the statements metric [#2883](https://github.com/MaibornWolff/codecharta/pull/2883)
+
+### Changed
+
+-   Select matching metric combination based on available metrics [#2862](https://github.com/MaibornWolff/codecharta/pull/2862)
+-   Unify UI of buttons in toolbar [#2857](https://github.com/MaibornWolff/codecharta/pull/2857)
+
+### Fixed 🐞
+
+-   Fix resetting of color range within color settings panel [#2877](https://github.com/MaibornWolff/codecharta/pull/2877)
+-   Fix resetting of colors in delta mode within color settings panel [#2873](https://github.com/MaibornWolff/codecharta/pull/2873)
+-   Restore global settings on page load again [#2878](https://github.com/MaibornWolff/codecharta/pull/2878)
+-   Fix 'undefinded' being displayed as a metric description when no description was available [#2883](https://github.com/MaibornWolff/codecharta/pull/2883)
+-   Fix windows standalone builds [#2881](https://github.com/MaibornWolff/codecharta/pull/2881)
+
+### Chore 👨‍💻 👩‍💻
+
+-   Migrate color settings panel to Angular [#2873](https://github.com/MaibornWolff/codecharta/pull/2873)

renovate.json

@@ -38,14 +38,5 @@
 		}
 	],
 	"timezone": "Europe/Berlin",
-	"schedule": ["on the 2nd and 4th day instance on sunday after 9pm"],
-	"regexManagers": [
-		{
-			"fileMatch": ["^visualization/package.json$"],
-			"matchStrings": ["\"nwVersion\": \"(?<currentValue>.*?)\""],
-			"depNameTemplate": "nwjs/nw.js",
-			"datasourceTemplate": "github-tags",
-			"extractVersionTemplate": "^nw-v(?<version>.*)$"
-		}
-	]
+	"schedule": ["on the 2nd and 4th day instance on sunday after 9pm"]
 }

visualization/app/codeCharta/util/scenarioHelper.ts

@@ -124,7 +124,6 @@ export class ScenarioHelper {
 	private static loadScenarios() {
 		const ccLocalStorage: LocalStorageScenarios = JSON.parse(localStorage.getItem(this.SCENARIOS_LOCAL_STORAGE_ELEMENT))
 		if (ccLocalStorage) {
-			// todo parse old format here
 			return new Map(ccLocalStorage.scenarios)
 		}
 		const scenarios = this.getPreLoadScenarios()