From c4007d850c14c9b339d66d8f831ea69b56f0124b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Dec 2022 18:03:03 +0000 Subject: [PATCH 01/21] (maint): Bump org.jetbrains.intellij from 1.10.1 to 1.11.0 in /src/rider Bumps org.jetbrains.intellij from 1.10.1 to 1.11.0. --- updated-dependencies: - dependency-name: org.jetbrains.intellij dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 2fefb542..73d7d0b5 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -11,7 +11,7 @@ plugins { // do NOT update kotlin - kotlin version must match platform version, see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library id("org.jetbrains.kotlin.jvm") version "1.7.0" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.10.1" + id("org.jetbrains.intellij") version "1.11.0" id("com.jetbrains.rdgen") version "2022.3.0" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "2.0.0" From 7bbfdcad4f9bd18a6e32f74219dfafe93183abc5 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Mon, 16 Jan 2023 15:12:53 +0100 Subject: [PATCH 02/21] (maint) switch platform from 2022.3-snapshot to 2022.3.1 to fix the build. --- src/rider/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/gradle.properties b/src/rider/gradle.properties index 977060eb..a5f5380b 100644 --- a/src/rider/gradle.properties +++ b/src/rider/gradle.properties @@ -12,7 +12,7 @@ pluginUntilBuild = 223.* pluginVerifierIdeVersions = RD-2022.3 platformType = RD -platformVersion = 2022.3-SNAPSHOT +platformVersion = 2022.3.1 platformDownloadSources = true # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 From c333422b3cbf5fc60a1185f71f1c0bd2b97995f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 14:33:49 +0000 Subject: [PATCH 03/21] (maint): Bump junit-jupiter from 5.9.1 to 5.9.2 in /src/rider Bumps [junit-jupiter](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 73d7d0b5..0c87a90b 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -36,7 +36,7 @@ repositories { dependencies { detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.9.1") + testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.1") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.1") From b9f046d3abcec017f87b3ac2c65677d87c90be6e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 18:06:16 +0000 Subject: [PATCH 04/21] (maint): Bump org.jetbrains.intellij from 1.11.0 to 1.12.0 in /src/rider Bumps org.jetbrains.intellij from 1.11.0 to 1.12.0. --- updated-dependencies: - dependency-name: org.jetbrains.intellij dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 0c87a90b..8924f995 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -11,7 +11,7 @@ plugins { // do NOT update kotlin - kotlin version must match platform version, see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library id("org.jetbrains.kotlin.jvm") version "1.7.0" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.11.0" + id("org.jetbrains.intellij") version "1.12.0" id("com.jetbrains.rdgen") version "2022.3.0" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "2.0.0" From 41fffdc8b49a1827c12047e990b61e5ba1f6ea45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 06:59:17 +0000 Subject: [PATCH 05/21] (maint): Bump junit-jupiter-engine from 5.9.1 to 5.9.2 in /src/rider Bumps [junit-jupiter-engine](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-engine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 8924f995..3e034a96 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -38,7 +38,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.1") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.1") } From 43c14d7b78b58015ea9ad15d9b98328f7563abd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 20:15:22 +0000 Subject: [PATCH 06/21] (maint): Bump junit-vintage-engine from 5.9.1 to 5.9.2 in /src/rider Bumps [junit-vintage-engine](https://github.com/junit-team/junit5) from 5.9.1 to 5.9.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.1...r5.9.2) --- updated-dependencies: - dependency-name: org.junit.vintage:junit-vintage-engine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 3e034a96..09b2b151 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.1") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") - testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.1") + testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.2") } // Configure gradle-intellij-plugin plugin. From ade8d78875fde2882072e6da9e906b8f2ea80ad9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Jan 2023 07:51:50 +0000 Subject: [PATCH 07/21] (maint): Bump junit-platform-launcher from 1.9.1 to 1.9.2 in /src/rider Bumps [junit-platform-launcher](https://github.com/junit-team/junit5) from 1.9.1 to 1.9.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/commits) --- updated-dependencies: - dependency-name: org.junit.platform:junit-platform-launcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 09b2b151..303a2033 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") - testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.1") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.2") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.2") } From eb69598e34fc51052820894fe91e9ee97c303a1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 18:01:37 +0000 Subject: [PATCH 08/21] (maint): Bump org.jlleitschuh.gradle.ktlint in /src/rider Bumps org.jlleitschuh.gradle.ktlint from 11.0.0 to 11.1.0. --- updated-dependencies: - dependency-name: org.jlleitschuh.gradle.ktlint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 303a2033..1cdefcab 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -18,7 +18,7 @@ plugins { // detekt linter - read more: https://detekt.github.io/detekt/gradle.html id("io.gitlab.arturbosch.detekt") version "1.22.0" // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle - id("org.jlleitschuh.gradle.ktlint") version "11.0.0" + id("org.jlleitschuh.gradle.ktlint") version "11.1.0" // grammarkit to generate parser & lexer (i.e. the bnf and the flex file...) id("org.jetbrains.grammarkit") version "2022.3" } From 0e5915c9b78d0eefbda6084cb5d7b1554c4240d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 18:58:41 +0000 Subject: [PATCH 09/21] (maint): Bump org.jetbrains.intellij from 1.12.0 to 1.13.1 in /src/rider Bumps org.jetbrains.intellij from 1.12.0 to 1.13.1. --- updated-dependencies: - dependency-name: org.jetbrains.intellij dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 1cdefcab..febde059 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -11,7 +11,7 @@ plugins { // do NOT update kotlin - kotlin version must match platform version, see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library id("org.jetbrains.kotlin.jvm") version "1.7.0" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.12.0" + id("org.jetbrains.intellij") version "1.13.1" id("com.jetbrains.rdgen") version "2022.3.0" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "2.0.0" From 783d41e2bcf87304a63981d19f4a75fc1404ab17 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Mar 2023 18:57:33 +0000 Subject: [PATCH 10/21] (maint): Bump org.jetbrains.intellij from 1.13.1 to 1.13.2 in /src/rider Bumps org.jetbrains.intellij from 1.13.1 to 1.13.2. --- updated-dependencies: - dependency-name: org.jetbrains.intellij dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index febde059..4aa65b68 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -11,7 +11,7 @@ plugins { // do NOT update kotlin - kotlin version must match platform version, see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library id("org.jetbrains.kotlin.jvm") version "1.7.0" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.13.1" + id("org.jetbrains.intellij") version "1.13.2" id("com.jetbrains.rdgen") version "2022.3.0" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "2.0.0" From 640f50f4eb1b440d87be78e4b4e7836816bed8a9 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Thu, 27 Apr 2023 17:46:53 +0200 Subject: [PATCH 11/21] (#323) Update GH-Runners --- .github/workflows/build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9fb10569..c01d0682 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ windows-2019, ubuntu-18.04, macos-10.15 ] + os: [ windows-2022, ubuntu-22.04, macos-12 ] steps: - name: Checkout the requested branch @@ -48,7 +48,7 @@ jobs: with: distribution: 'zulu' java-version: '17' - + # Setup dotnet 6 (and 2.1 for Wyam) - name: Setup dotnet uses: actions/setup-dotnet@v3.0.3 @@ -64,6 +64,11 @@ jobs: path: ~/.gradle/wrapper key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} + # install libgit2-dev on ubuntu, so libgit2sharp works + - name: Install libgit-dev + if: runner.os == 'Linux' + run: sudo apt-get install -y libgit2-dev + # Cache Cake tools - name: Cache Tools uses: actions/cache@v3 From 08dc97ff3bf6c2f6769539c98fb6b3180a5932c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 16:34:02 +0000 Subject: [PATCH 12/21] (maint): Bump gradle/wrapper-validation-action from 1.0.5 to 1.0.6 Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.5 to 1.0.6. - [Release notes](https://github.com/gradle/wrapper-validation-action/releases) - [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1.0.5...v1.0.6) --- updated-dependencies: - dependency-name: gradle/wrapper-validation-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c01d0682..df6dab8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,7 @@ jobs: # Validates the gradle wrappers and saves us from getting malicious PRs - name: Gradle Wrapper Validation - uses: gradle/wrapper-validation-action@v1.0.5 + uses: gradle/wrapper-validation-action@v1.0.6 # Setup Java 11 environment which is needed to build - name: Setup Java From 7ca689f4bd49e5ce65b8286b600aad58a06af258 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:24:17 +0000 Subject: [PATCH 13/21] (maint): Bump org.jetbrains.intellij from 1.13.2 to 1.13.3 in /src/rider Bumps org.jetbrains.intellij from 1.13.2 to 1.13.3. --- updated-dependencies: - dependency-name: org.jetbrains.intellij dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 4aa65b68..d7ed3a29 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -11,7 +11,7 @@ plugins { // do NOT update kotlin - kotlin version must match platform version, see https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library id("org.jetbrains.kotlin.jvm") version "1.7.0" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.13.2" + id("org.jetbrains.intellij") version "1.13.3" id("com.jetbrains.rdgen") version "2022.3.0" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin id("org.jetbrains.changelog") version "2.0.0" From 3b18fe0e2fbe12ab7f39af12d3d109ab7d9dbe3a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 19:39:41 +0000 Subject: [PATCH 14/21] (maint): Bump org.jlleitschuh.gradle.ktlint in /src/rider Bumps org.jlleitschuh.gradle.ktlint from 11.1.0 to 11.3.2. --- updated-dependencies: - dependency-name: org.jlleitschuh.gradle.ktlint dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index d7ed3a29..68171a5f 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -18,7 +18,7 @@ plugins { // detekt linter - read more: https://detekt.github.io/detekt/gradle.html id("io.gitlab.arturbosch.detekt") version "1.22.0" // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle - id("org.jlleitschuh.gradle.ktlint") version "11.1.0" + id("org.jlleitschuh.gradle.ktlint") version "11.3.2" // grammarkit to generate parser & lexer (i.e. the bnf and the flex file...) id("org.jetbrains.grammarkit") version "2022.3" } From 2d669f850852c55131662e5b6cf2300e1be8ec84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 20:14:23 +0000 Subject: [PATCH 15/21] (maint): Bump org.junit.platform:junit-platform-launcher in /src/rider Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.9.2 to 1.9.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/commits) --- updated-dependencies: - dependency-name: org.junit.platform:junit-platform-launcher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 68171a5f..efc357fc 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -37,7 +37,7 @@ dependencies { detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") - testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.2") + testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.3") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.2") } From 620e3e234bf82a9682a1a291005009cc5ce50c94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 21:18:30 +0000 Subject: [PATCH 16/21] (maint): Bump org.junit.vintage:junit-vintage-engine in /src/rider Bumps [org.junit.vintage:junit-vintage-engine](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3) --- updated-dependencies: - dependency-name: org.junit.vintage:junit-vintage-engine dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index efc357fc..812ae6ed 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -39,7 +39,7 @@ dependencies { testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.3") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") - testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.2") + testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.3") } // Configure gradle-intellij-plugin plugin. From 4573a75b40918c2d397d08b2be6442a4ee9ab954 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Apr 2023 17:01:59 +0000 Subject: [PATCH 17/21] (maint): Bump org.jetbrains.grammarkit in /src/rider Bumps org.jetbrains.grammarkit from 2022.3 to 2022.3.1. --- updated-dependencies: - dependency-name: org.jetbrains.grammarkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index 812ae6ed..df0b8831 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -20,7 +20,7 @@ plugins { // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle id("org.jlleitschuh.gradle.ktlint") version "11.3.2" // grammarkit to generate parser & lexer (i.e. the bnf and the flex file...) - id("org.jetbrains.grammarkit") version "2022.3" + id("org.jetbrains.grammarkit") version "2022.3.1" } val jvmVersion = "17" @@ -105,7 +105,7 @@ tasks { // generate the lexer (uses grammarkit) generateLexer { - source.set("src/main/kotlin/net/cakebuild/language/psi/Cake.flex") + sourceFile.set(File(rootDir, "src/main/kotlin/net/cakebuild/language/psi/Cake.flex")) targetDir.set("src/main/gen/net/cakebuild/language/psi") targetClass.set("CakeLexer") purgeOldFiles.set(true) @@ -142,7 +142,7 @@ tasks { // generate the parser (uses grammarkit) generateParser { - source.set("src/main/kotlin/net/cakebuild/language/psi/Cake.bnf") + sourceFile.set(File(rootDir, "src/main/kotlin/net/cakebuild/language/psi/Cake.bnf")) targetRoot.set("src/main/gen") pathToParser.set("/net/cakebuild/language/psi/CakeParser.java") pathToPsiRoot.set("/net/cakebuild/language/psi") From 367e06ea9055caeb7951e41062c2b31e6197e77e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 28 Apr 2023 18:57:17 +0000 Subject: [PATCH 18/21] (maint): Bump org.junit.jupiter:junit-jupiter in /src/rider Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.9.2 to 5.9.3. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/compare/r5.9.2...r5.9.3) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- src/rider/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rider/build.gradle.kts b/src/rider/build.gradle.kts index df0b8831..8ed4dff5 100644 --- a/src/rider/build.gradle.kts +++ b/src/rider/build.gradle.kts @@ -36,9 +36,9 @@ repositories { dependencies { detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0") - testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") + testImplementation("org.junit.jupiter:junit-jupiter:5.9.3") testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.3") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.2") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3") testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.3") } From d219868d61a01af2c21b2b08ae7a299b22a49ed2 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Fri, 25 Aug 2023 21:34:51 +0200 Subject: [PATCH 19/21] (#352) bump Cake.IntelliJ.Recipe to 0.2.2 --- .config/dotnet-tools.json | 2 +- .github/workflows/build.yml | 7 ++++--- build.ps1 | 28 +++++++++------------------- build.sh | 2 -- recipe.cake | 9 +++++---- 5 files changed, 19 insertions(+), 29 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 727dfd76..4903ba5f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "0.38.5", + "version": "1.3.0", "commands": [ "dotnet-cake" ] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df6dab8a..611aecf5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,12 +49,14 @@ jobs: distribution: 'zulu' java-version: '17' - # Setup dotnet 6 (and 2.1 for Wyam) + # Setup dotnet 6 (and 2.1 for Wyam, 3.1 for gitReleaseManager, 5.0 for gitVersion) - name: Setup dotnet uses: actions/setup-dotnet@v3.0.3 with: dotnet-version: | 2.1.x + 3.1.x + 5.0.x 6.0.x # Cache Gradle Wrapper @@ -81,8 +83,7 @@ jobs: with: script-path: recipe.cake target: CI - cake-version: 0.38.5 - cake-bootstrap: true + cake-version: tool-manifest # currently, Cake.Recipe does not upload artifacts when run on gh-actions - name: Upload Issues diff --git a/build.ps1 b/build.ps1 index 26123b95..ccd28ac0 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,26 +1,16 @@ #$ErrorActionPreference = 'Stop' -# $ErrorActionPreference = 'Stop' will break the build on *any* output to stderr. +# $ErrorActionPreference = 'Stop' will break the build on *any* output to stderr. # i.e. calling `java -version` will break the build in that case. # This might be solved in PS 7.1, see https://docs.microsoft.com/en-us/powershell/scripting/whats-new/what-s-new-in-powershell-71?view=powershell-7.1#breaking-changes-and-improvements -function Run([string[]]$arguments) { - $cmd = @("& dotnet") - $cmd += $arguments - $cmdLine = $cmd -join " " - Write-Verbose "> $cmdLine" - Invoke-Expression $cmdLine +Set-Location -LiteralPath $PSScriptRoot - if ($LASTEXITCODE -ne 0) { - Write-Host "Non-Zero exit code ($($LASTEXITCODE)), exiting..." - exit $LASTEXITCODE - } -} +$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = '1' +$env:DOTNET_CLI_TELEMETRY_OPTOUT = '1' +$env:DOTNET_NOLOGO = '1' -Run tool, restore +dotnet tool restore +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } -Run cake, recipe.cake, --bootstrap - -$arguments = @("cake"; "recipe.cake") -$arguments += @($args) - -Run $arguments \ No newline at end of file +dotnet cake recipe.cake @args +if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE } diff --git a/build.sh b/build.sh index ddd0ca9b..35dc3a4f 100755 --- a/build.sh +++ b/build.sh @@ -6,6 +6,4 @@ export DOTNET_NOLOGO=1 dotnet tool restore -dotnet cake recipe.cake --bootstrap - dotnet cake recipe.cake "$@" \ No newline at end of file diff --git a/recipe.cake b/recipe.cake index e6fd99c5..8ea816ab 100644 --- a/recipe.cake +++ b/recipe.cake @@ -1,10 +1,10 @@ -#load nuget:?package=Cake.IntelliJ.Recipe&version=0.1.5 +#load nuget:?package=Cake.IntelliJ.Recipe&version=0.2.2 Environment.SetVariableNames( githubTokenVariable: "GITHUB_PAT" ); -BuildParameters.SetParameters( +IntelliJBuildParameters.SetParameters( context: Context, buildSystem: BuildSystem, sourceDirectoryPath: "./src/rider", @@ -18,8 +18,9 @@ BuildParameters.SetParameters( preferredBuildAgentOperatingSystem: PlatformFamily.Linux ); -BuildParameters.PrintParameters(Context); +BuildParameters.IsDotNetCoreBuild = true; // so we get all the cool dotnet tools +IntelliJBuildParameters.PrintParameters(Context); ToolSettings.SetToolSettings(context: Context); -Build.Run(); +IntelliJBuild.Run(); From a578189c3dd15472e2d6f5e5caf795f6f9d02ded Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Tue, 22 Aug 2023 20:39:00 +0200 Subject: [PATCH 20/21] (#325) bumped rider version to 2023.1 --- src/dotnet/Directory.Build.props | 2 +- src/dotnet/cake-rider/CakePredefinedType.cs | 6 +++--- src/rider/.idea/gradle.xml | 4 ---- src/rider/.idea/kotlinc.xml | 2 +- src/rider/build.gradle.kts | 6 +++--- src/rider/gradle.properties | 8 ++++---- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/dotnet/Directory.Build.props b/src/dotnet/Directory.Build.props index 32ad9c53..9586f09b 100644 --- a/src/dotnet/Directory.Build.props +++ b/src/dotnet/Directory.Build.props @@ -6,7 +6,7 @@ false pdbonly - 2022.2.0 + 2023.1.0 $(SdkVersion.Substring(2,2))$(SdkVersion.Substring(5,1)).0.0 None diff --git a/src/dotnet/cake-rider/CakePredefinedType.cs b/src/dotnet/cake-rider/CakePredefinedType.cs index 0fcd6a06..cd735c99 100644 --- a/src/dotnet/cake-rider/CakePredefinedType.cs +++ b/src/dotnet/cake-rider/CakePredefinedType.cs @@ -64,7 +64,7 @@ private IDeclaredType CreateType(int index, IClrTypeName clrName) { lock (_types) { - _types[index] ??= new PredefinedDeclaredTypeFromClrName(clrName, NullableAnnotation.Unknown, _module); + _types[index] ??= new PredefinedDeclaredTypeFromClrName(clrName, _module); } } @@ -73,8 +73,8 @@ private IDeclaredType CreateType(int index, IClrTypeName clrName) private class PredefinedDeclaredTypeFromClrName : DeclaredTypeFromCLRName { - public PredefinedDeclaredTypeFromClrName(IClrTypeName clrName, NullableAnnotation annotation, IPsiModule module) - : base(clrName, annotation, module) + public PredefinedDeclaredTypeFromClrName(IClrTypeName clrName, IPsiModule module) + : base(clrName, module) { } diff --git a/src/rider/.idea/gradle.xml b/src/rider/.idea/gradle.xml index 3f024907..776aeac3 100644 --- a/src/rider/.idea/gradle.xml +++ b/src/rider/.idea/gradle.xml @@ -4,11 +4,7 @@