fix(create-nx-cmake,nx-cmake): remove deprecated setting from .clang-…

…tidy
clemenscodes · Mar 17, 2024 · 4fcd287 · 4fcd287
1 parent 2f30f2c
commit 4fcd287
Show file tree

Hide file tree

Showing 14 changed files with 198 additions and 183 deletions.
diff --git a/codecov.yml b/codecov.yml
@@ -36,12 +36,6 @@ component_management:
         - component_id: mocks
           paths:
               - 'packages/mocks/**'
-        - component_id: types
-          paths:
-              - 'packages/types/**'
         - component_id: util
           paths:
               - 'packages/util/**'
-        - component_id: verdaccio
-          paths:
-              - 'packages/verdaccio/**'
diff --git a/nx.json b/nx.json
@@ -1,32 +1,11 @@
 {
-    "pluginsConfig": {
-        "@nx/js": {
-            "analyzeSourceFiles": true
-        },
-        "nx-cmake": {
-            "language": "C",
-            "cmakeConfigDir": ".cmake",
-            "workspaceName": "workspace"
-        }
-    },
     "extends": "nx/presets/npm.json",
+    "$schema": "./node_modules/nx/schemas/nx-schema.json",
+    "defaultBase": "origin/main",
     "defaultProject": "verdaccio",
-    "release": {
-        "projects": ["plugins/*"],
-        "projectsRelationship": "independent",
-        "releaseTagPattern": "{projectName}-{version}",
-        "changelog": {
-            "workspaceChangelog": false,
-            "projectChangelogs": {
-                "createRelease": "github"
-            }
-        },
-        "git": {
-            "commitMessage": "chore({projectName}): release version {version} [skip ci]"
-        },
-        "version": {
-            "conventionalCommits": true
-        }
+    "workspaceLayout": {
+        "appsDir": "bin",
+        "libsDir": "packages"
     },
     "tasksRunnerOptions": {
         "default": {
@@ -47,15 +26,6 @@
             }
         }
     },
-    "$schema": "./node_modules/nx/schemas/nx-schema.json",
-    "affected": {
-        "defaultBase": "origin/main"
-    },
-    "workspaceLayout": {
-        "appsDir": "bin",
-        "libsDir": "packages"
-    },
-    "plugins": ["nx-cmake"],
     "targetDefaults": {
         "build": {
             "dependsOn": ["lint", "^build"]
@@ -126,5 +96,33 @@
                 "generateTests": true
             }
         }
-    }
+    },
+    "release": {
+        "projects": ["plugins/*"],
+        "projectsRelationship": "independent",
+        "releaseTagPattern": "{projectName}-{version}",
+        "changelog": {
+            "workspaceChangelog": false,
+            "projectChangelogs": {
+                "createRelease": "github"
+            }
+        },
+        "git": {
+            "commitMessage": "chore({projectName}): release version {version} [skip ci]"
+        },
+        "version": {
+            "conventionalCommits": true
+        }
+    },
+    "pluginsConfig": {
+        "@nx/js": {
+            "analyzeSourceFiles": true
+        },
+        "nx-cmake": {
+            "language": "C",
+            "cmakeConfigDir": ".cmake",
+            "workspaceName": "workspace"
+        }
+    },
+    "plugins": ["nx-cmake"]
 }
diff --git a/package.json b/package.json
@@ -26,11 +26,11 @@
         "@commitlint/config-conventional": "^18.6.1",
         "@commitlint/config-nx-scopes": "^18.6.1",
         "@commitlint/types": "^18.6.1",
-        "@nx/eslint": "18.0.8",
-        "@nx/eslint-plugin": "18.0.8",
-        "@nx/jest": "18.0.8",
-        "@nx/js": "18.0.8",
-        "@nx/plugin": "18.0.8",
+        "@nx/eslint": "18.1.1",
+        "@nx/eslint-plugin": "18.1.1",
+        "@nx/jest": "18.1.1",
+        "@nx/js": "18.1.1",
+        "@nx/plugin": "18.1.1",
         "@swc-node/register": "1.9.0",
         "@swc/cli": "~0.3.10",
         "@swc/core": "1.4.6",
@@ -48,15 +48,15 @@
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "jest-environment-node": "^29.7.0",
-        "nx": "18.0.8",
+        "nx": "18.1.1",
         "prettier": "^3.2.5",
         "ts-jest": "^29.1.2",
         "ts-node": "10.9.2",
         "typescript": "5.4.2",
         "verdaccio": "^5.29.2"
     },
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "@swc/helpers": "0.5.6",
         "create-nx-workspace": "18.0.8",
         "tslib": "^2.6.2"

diff --git a/packages/command/package.json b/packages/command/package.json
@@ -2,7 +2,7 @@
     "name": "@/command",
     "version": "0.0.1",
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "tslib": "^2.6.2"
     },
     "private": true,

diff --git a/packages/file/package.json b/packages/file/package.json
@@ -2,7 +2,7 @@
     "name": "@/file",
     "version": "0.0.1",
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "tslib": "^2.6.2"
     },
     "private": true,

diff --git a/packages/log/package.json b/packages/log/package.json
@@ -2,7 +2,7 @@
     "name": "@/log",
     "version": "0.0.1",
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "tslib": "^2.6.2"
     },
     "private": true,

diff --git a/packages/mocks/package.json b/packages/mocks/package.json
@@ -2,7 +2,7 @@
     "name": "@/mocks",
     "version": "0.0.1",
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "tslib": "^2.6.2"
     },
     "private": true,

diff --git a/packages/types/package.json b/packages/types/package.json
@@ -2,7 +2,7 @@
     "name": "@/types",
     "version": "0.0.1",
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "tslib": "^2.6.2"
     },
     "private": true,

diff --git a/packages/util/package.json b/packages/util/package.json
@@ -2,7 +2,7 @@
     "name": "@/util",
     "version": "0.0.1",
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "tslib": "^2.6.2"
     },
     "private": true,

diff --git a/packages/verdaccio/package.json b/packages/verdaccio/package.json
@@ -2,7 +2,7 @@
     "name": "@/verdaccio",
     "version": "0.0.1",
     "dependencies": {
-        "@nx/devkit": "18.0.8",
+        "@nx/devkit": "18.1.1",
         "tslib": "^2.6.2"
     },
     "private": true,

diff --git a/plugins/nx-cmake/package.json b/plugins/nx-cmake/package.json
@@ -33,6 +33,6 @@
     },
     "dependencies": {
         "tslib": "^2.6.2",
-        "@nx/devkit": "18.0.8"
+        "@nx/devkit": "18.1.1"
     }
 }
diff --git a/plugins/nx-cmake/src/generators/init/generateClangPreset/generateClangPreset.spec.ts b/plugins/nx-cmake/src/generators/init/generateClangPreset/generateClangPreset.spec.ts
@@ -22,7 +22,6 @@ describe('generateClangPreset', () => {
             "Checks: 'clang-diagnostic-*,clang-analyzer-*'\n" +
             "WarningsAsErrors: ''\n" +
             "HeaderFilterRegex: ''\n" +
-            'AnalyzeTemporaryDtors: false\n' +
             'FormatStyle: none\n';
         expectedClangFormatFileContent =
             'BasedOnStyle: LLVM\n' +

diff --git a/plugins/nx-cmake/src/generators/init/generateClangPreset/template/.clang-tidy.template b/plugins/nx-cmake/src/generators/init/generateClangPreset/template/.clang-tidy.template
@@ -1,5 +1,4 @@
 Checks: 'clang-diagnostic-*,clang-analyzer-*'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
-AnalyzeTemporaryDtors: false
 FormatStyle: none