From 62641388d463dd69b9ce1586c275287c1fe9f620 Mon Sep 17 00:00:00 2001 From: bohdan-harniuk Date: Tue, 1 Feb 2022 19:47:35 +0200 Subject: [PATCH 1/4] Init 4.2.3 + trying to fix missed library --- .github/workflows/gradle.yml | 2 +- CHANGELOG.md | 2 ++ README.md | 2 +- build.gradle | 3 ++- resources/META-INF/plugin.xml | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 9accc17e7..daaeb45c7 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -5,7 +5,7 @@ name: Run automated tests on: pull_request: - branches: [ master, 4.2.2-develop ] + branches: [ master, 4.2.3-develop ] jobs: build-linux: diff --git a/CHANGELOG.md b/CHANGELOG.md index 450e4ce96..067d0fcc0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0). +## 4.2.3 + ## 4.2.2 ### Added diff --git a/README.md b/README.md index c89899b06..4ec852d74 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ 1. Check out this repository 1. Open a folder with the project in the IntelliJ Ultimate using the `open` action button. -1. Make sure that you on the latest develop branch (e.g `4.2.2-develop`) +1. Make sure that you on the latest develop branch (e.g `4.2.3-develop`) 1. Right-click on the `build.gradle` file, choose "Import Gradle project" (if this is not exist look for "Build module ''") (you need to have Gradle plugin installed) 1. Check if the right SDK version is used for the project. - Current Java version for the project is **java 11**, so you should additionally download **SDK 11** and choose it in the module settings: `Right click by the project root > Open Module Settings > Project Settings > Project > Project SDK` diff --git a/build.gradle b/build.gradle index b30be3e79..a759398ca 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ repositories { } group 'com.magento.idea' -version '4.2.2' +version '4.2.3' apply plugin: 'org.jetbrains.intellij' apply plugin: 'java' @@ -106,6 +106,7 @@ idea { dependencies { testImplementation 'junit:junit:4.13' + implementation 'org.json:json:20211205' } test { diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index 04f9d69c7..a97148de3 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -7,7 +7,7 @@ com.magento.idea.magento2plugin Magento PhpStorm - 4.2.2 + 4.2.3 Magento Inc. Date: Tue, 1 Feb 2022 19:56:06 +0200 Subject: [PATCH 2/4] Fixed style check --- .../stubs/indexes/graphql/GraphQlResolverIndex.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/magento/idea/magento2plugin/stubs/indexes/graphql/GraphQlResolverIndex.java b/src/com/magento/idea/magento2plugin/stubs/indexes/graphql/GraphQlResolverIndex.java index 05351ddbb..35f80af4f 100644 --- a/src/com/magento/idea/magento2plugin/stubs/indexes/graphql/GraphQlResolverIndex.java +++ b/src/com/magento/idea/magento2plugin/stubs/indexes/graphql/GraphQlResolverIndex.java @@ -36,6 +36,7 @@ import java.util.Map; import org.jetbrains.annotations.NotNull; +@SuppressWarnings({"PMD.ExcessiveImports"}) public class GraphQlResolverIndex extends ScalarIndexExtension { public static final ID KEY = ID.create("com.magento.idea.magento2plugin.stubs.indexes.resolver_usages"); From 2e991a38734b5c838eba882334ab1c7904e3a68b Mon Sep 17 00:00:00 2001 From: bohdan-harniuk Date: Wed, 2 Feb 2022 15:05:05 +0200 Subject: [PATCH 3/4] Added simple-json library to the project distribution --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a759398ca..e454bdc40 100644 --- a/build.gradle +++ b/build.gradle @@ -106,7 +106,7 @@ idea { dependencies { testImplementation 'junit:junit:4.13' - implementation 'org.json:json:20211205' + implementation 'com.googlecode.json-simple:json-simple:1.1.1' } test { From d7a43c8cb36e19a96b04d8b3c7fc09c1b08763d3 Mon Sep 17 00:00:00 2001 From: bohdan-harniuk Date: Wed, 2 Feb 2022 16:14:51 +0200 Subject: [PATCH 4/4] Updated changelog for release 4.2.3 --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 067d0fcc0..cf2dd70ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0). ## 4.2.3 +### Fixed + +- Fixed a simple-json library is absent in the distribution in [#951](https://github.com/magento/magento2-phpstorm-plugin/pull/951) + ## 4.2.2 ### Added