Skip to content

Commit

Permalink
Merge pull request #49 from picimako/v0.9.0
Browse files Browse the repository at this point in the history
V0.9.0
  • Loading branch information
picimako committed Jun 5, 2024
2 parents 9e89447 + c155dc1 commit 7c1f5c5
Show file tree
Hide file tree
Showing 37 changed files with 182 additions and 1,036 deletions.
20 changes: 12 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ on:
# Trigger the workflow on any pull request
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:

# Prepare environment and build the plugin
Expand All @@ -37,7 +41,7 @@ jobs:

# Validate wrapper
- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.1.0
uses: gradle/wrapper-validation-action@v2

# Set up Java environment for the next steps
- name: Setup Java
Expand All @@ -48,7 +52,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
gradle-home-cache-cleanup: true

Expand Down Expand Up @@ -87,7 +91,7 @@ jobs:
# Store already-built plugin as an artifact for downloading
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ steps.artifact.outputs.filename }}
path: ./build/distributions/content/*/*
Expand All @@ -112,7 +116,7 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
gradle-home-cache-cleanup: true

Expand All @@ -123,7 +127,7 @@ jobs:
# Collect Tests Result of failed tests
- name: Collect Tests Result
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: tests-result
path: ${{ github.workspace }}/build/reports/tests
Expand Down Expand Up @@ -155,13 +159,13 @@ jobs:

# Setup Gradle
- name: Setup Gradle
uses: gradle/gradle-build-action@v2
uses: gradle/actions/setup-gradle@v3
with:
gradle-home-cache-cleanup: true

# Cache Plugin Verifier IDEs
- name: Setup Plugin Verifier IDEs Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
Expand All @@ -173,7 +177,7 @@ jobs:
# Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result
if: ${{ always() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: pluginVerifier-result
path: ${{ github.workspace }}/build/reports/pluginVerifier
60 changes: 0 additions & 60 deletions .github/workflows/run-ui-tests.yml

This file was deleted.

9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,16 @@

## [Unreleased]

### [0.9.0]
### Changed
- Supported IDE version range: 2023.3-2024.2-EAP.
- Plugin configuration and dependency updates.
- Deleted the inspection options panel generation action because there is a newer API for that that provides
an easier way to create the panel.

## [0.8.1]
### Fixed
- Added a missing `getActionUpdateThread()` method override to avoid throwing exception.
- Added a missing `getActionUpdateThread()` method override to avoid throwing exception.

## [0.8.0]
### Changed
Expand Down
22 changes: 12 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ kotlin {

dependencies {
//https://kotlinlang.org/docs/reflection.html#jvm-dependency
implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.21")
implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.23")

//Testing
testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21")
testImplementation("org.assertj:assertj-core:3.24.2")
testImplementation("org.assertj:assertj-core:3.26.0")
}

// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
Expand Down Expand Up @@ -94,18 +93,21 @@ tasks {

//Uncomment and configure this for functional testing
test {
// systemProperty("idea.home.path", "ABSOLUTE PATH TO LOCAL intellij-community")

//Required for running tests in 2021.3 due to it not finding test classes properly.
//See https://app.slack.com/client/T5P9YATH9/C5U8BM1MK/thread/C5U8BM1MK-1639934273.054400
isScanForTestClasses = false
include("**/*Test.class")
exclude(
//Disabled due to haven't been able to make the tests resolve the bundle properties files. The functionality works in production environment.
"**/PluginDescriptorTagsFoldingBuilderResourceBundleTest.class",

//Disabled due to requiring app-client.jar that can't be uploaded to GitHub due to size constraints
"**/JavaConversionActionsTest.class",
"**/ConversionActionsKotlinTest.class",
"**/MakeJavaClassPersistentStateComponentIntentionTest.class"
)
}

// runPluginVerifier {
// ideVersions.set(listOf("IC-232.7754.73"))
// }

signPlugin {
certificateChain = environment("CERTIFICATE_CHAIN")
privateKey = environment("PRIVATE_KEY")
Expand All @@ -118,6 +120,6 @@ tasks {
// The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
// Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
// https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
channels = properties("pluginVersion").map { listOf(it.split('-').getOrElse(1) { "default" }.split('.').first()) }
channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
}
}
92 changes: 0 additions & 92 deletions docs/inspections.md

This file was deleted.

16 changes: 7 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@
pluginGroup = com.picimako.justkitting
pluginName = Just Kitting
pluginRepositoryUrl = https://github.com/picimako/just-kitting
pluginVersion = 0.8.1
pluginVersion = 0.9.0

# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
pluginSinceBuild = 231.9392.1
pluginUntilBuild = 241.*
pluginSinceBuild = 233.11799.241
pluginUntilBuild = 242.*

# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
platformType = IC
platformVersion = 2023.1.5
platformVersion = 2023.3

# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
# DevKit: https://plugins.jetbrains.com/plugin/22851-plugin-devkit/versions/stable
# Properties: https://plugins.jetbrains.com/plugin/11594-properties/versions/stable
platformPlugins = java,org.jetbrains.kotlin,DevKit,com.intellij.properties:231.8770.3
platformPlugins = java,org.jetbrains.kotlin,DevKit:233.11799.300,com.intellij.properties:233.11799.172

# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 8.5
gradleVersion = 8.7

# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
kotlin.stdlib.default.dependency = false
Expand All @@ -29,6 +30,3 @@ org.gradle.configuration-cache = true

# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
org.gradle.caching = true

# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
systemProp.org.gradle.unsafe.kotlin.assignment = true
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
annotations = "24.1.0"

# plugins
kotlin = "1.9.21"
kotlin = "1.9.23"
changelog = "2.2.0"
gradleIntelliJPlugin = "1.17.0"
lombok = "8.3"
gradleIntelliJPlugin = "1.17.3"
lombok = "8.6"

[libraries]
annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit 7c1f5c5

Please sign in to comment.