Skip to content

Commit

Permalink
Merge branch 'master' into release/2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Pakisan committed Dec 2, 2024
2 parents a399dce + 348f24d commit 059035d
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/automerge-for-humans-merging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
| join("\n")'
multiline: true
- name: Automerge PR
uses: pascalgn/automerge-action@d1203c0bf94a827b991e5de69d662e9163304fa0 #v0.16.3 https://github.com/pascalgn/automerge-action/releases/tag/v0.16.3
uses: pascalgn/automerge-action@7961b8b5eec56cc088c140b56d864285eabd3f67 #v0.16.4 https://github.com/pascalgn/automerge-action/releases/tag/v0.16.4
env:
GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
MERGE_LABELS: "!do-not-merge,ready-to-merge"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Automerging
uses: pascalgn/automerge-action@d1203c0bf94a827b991e5de69d662e9163304fa0 #v0.16.3 https://github.com/pascalgn/automerge-action/releases/tag/v0.16.3
uses: pascalgn/automerge-action@7961b8b5eec56cc088c140b56d864285eabd3f67 #v0.16.4 https://github.com/pascalgn/automerge-action/releases/tag/v0.16.4
env:
GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
GITHUB_LOGIN: asyncapi-bot
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/update-maintainers-trigger.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This action is centrally managed in https://github.com/asyncapi/.github/
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo

name: Trigger MAINTAINERS.yaml file update

on:
push:
branches: [ master ]
paths:
# Check all valid CODEOWNERS locations:
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners#codeowners-file-location
- 'CODEOWNERS'
- '.github/CODEOWNERS'
- '.docs/CODEOWNERS'

jobs:
trigger-maintainers-update:
name: Trigger updating MAINTAINERS.yaml because of CODEOWNERS change
runs-on: ubuntu-latest

steps:
- name: Repository Dispatch
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # https://github.com/peter-evans/repository-dispatch/releases/tag/v3.0.0
with:
# The PAT with the 'public_repo' scope is required
token: ${{ secrets.GH_TOKEN }}
repository: ${{ github.repository_owner }}/community
event-type: trigger-maintainers-update
16 changes: 8 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
import org.jetbrains.intellij.platform.gradle.tasks.VerifyPluginTask

plugins {
id("org.jetbrains.intellij.platform") version "2.0.1"
id("org.jetbrains.intellij.platform") version "2.1.0"
java
kotlin("jvm") version "2.0.20"
kotlin("jvm") version "2.1.0"
}

group = "com.asyncapi.plugin.idea"
Expand Down Expand Up @@ -40,13 +40,13 @@ dependencies {
testFramework(TestFrameworkType.Platform)
}

implementation("com.fasterxml.jackson.core:jackson-core:2.17.2")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.17.2")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.17.2")
implementation("com.fasterxml.jackson.core:jackson-core:2.18.2")
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.2")
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.18.2")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.11.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.3")
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.11.3")
}

// See https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html
Expand Down

0 comments on commit 059035d

Please sign in to comment.