Skip to content
This repository has been archived by the owner on Feb 4, 2022. It is now read-only.

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
d-wojciechowski committed Dec 21, 2020
2 parents 844338c + 3bfc89f commit 314fc10
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 15 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/plugin-verification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@ jobs:
- name: Verify Plugin on IntelliJ Platforms
if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'
id: verify
uses: ChrisCarini/intellij-platform-plugin-verifier-action@v0.0.2
uses: ChrisCarini/intellij-platform-plugin-verifier-action@latest
with:
ide-versions: |
ideaIC:2020.1
ideaIC:2020.2
ideaIC:2020.3
ideaIC:LATEST-EAP-SNAPSHOT
- name: Get log file path and print contents
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## [1.0.1]
### Fixed
- Compatibility with Intellij 2020.3

## [1.0.0]
### Added
- New startup activity which displays plugin info page with links and support section.
Expand Down
26 changes: 13 additions & 13 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ import org.jetbrains.changelog.closure
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

group = "pl.dwojciechowski"
version = "1.0.0"
version = "1.0.1"
val protobufVersion = "3.12.4"
val rSocketRpcVersion = "0.2.18"
val rSocketVersion = "1.0.0-RC7"
val coroutinesVersion = "1.3.7"
val fuelVersion = "2.2.3"
val rxJavaVersion = "3.0.5"
val coroutinesVersion = "1.4.2"
val fuelVersion = "2.3.0"
val rxJavaVersion = "3.0.7"

plugins {
id("org.jetbrains.changelog") version "0.4.0"
id("com.github.ben-manes.versions") version "0.29.0"
id("org.jetbrains.intellij") version "0.4.21"
id("com.google.protobuf") version "0.8.12"
kotlin("jvm") version "1.3.72"
id("org.jetbrains.changelog") version "0.6.2"
id("com.github.ben-manes.versions") version "0.36.0"
id("org.jetbrains.intellij") version "0.6.5"
id("com.google.protobuf") version "0.8.14"
kotlin("jvm") version "1.4.10"
java
idea
}
Expand All @@ -42,7 +42,7 @@ dependencies {
//Do not use implementation here, compile is needed :
// https://github.com/JetBrains/gradle-intellij-plugin/issues/239
// https://github.com/JetBrains/gradle-intellij-plugin/issues/456
compile("com.google.protobuf:protobuf-java:$protobufVersion")
implementation("com.google.protobuf:protobuf-java:$protobufVersion")
}

sourceSets {
Expand All @@ -54,7 +54,7 @@ sourceSets {
}

intellij {
version = "2020.2"
version = "2020.3"
updateSinceUntilBuild = true
pluginName = "PLM Companion"
}
Expand Down Expand Up @@ -84,8 +84,8 @@ tasks {
changelog {
version = "${project.version}"
path = "${project.projectDir}/CHANGELOG.md"
headerFormat = "[{0}]"
headerArguments = listOf("${project.version}")
header = closure{"[{0}]"}
headerParserRegex = """\d+\.\d+.\d+""".toRegex()
itemPrefix = "-"
unreleasedTerm = "[Unreleased]"
groups = listOf("Added", "Changed", "Fixed")
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Sat Apr 25 20:42:58 CEST 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

<extensions defaultExtensionNs="com.intellij">

<notificationGroup id="PLMCompanionNotifGroup" displayType="BALLOON" isLogByDefault="true"/>

<postStartupActivity implementation="pl.dwojciechowski.activities.NewVersionStartupActivity"/>

<configurationType implementation="pl.dwojciechowski.execution.RemoteCommandConfigType"/>
Expand Down

0 comments on commit 314fc10

Please sign in to comment.