diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 23b6ac3..eac0d52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -35,19 +35,18 @@ jobs:
# Check out current repository
- name: Fetch Sources
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v3
# Validate wrapper
- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.0.4
- # Setup Java 11 environment for the next steps
+ # Setup Java 17 environment for the next steps
- name: Setup Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
distribution: zulu
- java-version: 11
- cache: gradle
+ java-version: 17
# Set environment variables
- name: Export Properties
@@ -76,14 +75,14 @@ jobs:
# Collect Tests Result of failed tests
- name: Collect Tests Result
if: ${{ failure() }}
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: tests-result
path: ${{ github.workspace }}/build/reports/tests
# Cache Plugin Verifier IDEs
- name: Setup Plugin Verifier IDEs Cache
- uses: actions/cache@v2.1.7
+ uses: actions/cache@v3
with:
path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@@ -95,14 +94,14 @@ jobs:
# Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result
if: ${{ always() }}
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
name: pluginVerifier-result
path: ${{ github.workspace }}/build/reports/pluginVerifier
# Run Qodana inspections
- name: Qodana - Code Inspection
- uses: JetBrains/qodana-action@v4.2.5
+ uses: JetBrains/qodana-action@v2022.1.1
# Prepare plugin archive content for creating artifact
- name: Prepare Plugin Artifact
@@ -117,7 +116,7 @@ jobs:
# Store already-built plugin as an artifact for downloading
- name: Upload artifact
- uses: actions/upload-artifact@v2.2.4
+ uses: actions/upload-artifact@v3
with:
name: ${{ steps.artifact.outputs.filename }}
path: ./build/distributions/content/*/*
@@ -129,11 +128,13 @@ jobs:
if: github.event_name != 'pull_request'
needs: build
runs-on: ubuntu-latest
+ permissions:
+ contents: write
steps:
# Check out current repository
- name: Fetch Sources
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v3
# Remove old release drafts by using the curl request for the available releases with draft flag
- name: Remove Old Release Drafts
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8c8661e..05425ac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,21 +12,23 @@ jobs:
release:
name: Publish Plugin
runs-on: ubuntu-latest
+ permissions:
+ contents: write
+ pull-requests: write
steps:
# Check out current repository
- name: Fetch Sources
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v3
with:
ref: ${{ github.event.release.tag_name }}
- # Setup Java 11 environment for the next steps
+ # Setup Java 17 environment for the next steps
- name: Setup Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
distribution: zulu
- java-version: 11
- cache: gradle
+ java-version: 17
# Set environment variables
- name: Export Properties
diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
index 1027273..abf6a7d 100644
--- a/.github/workflows/run-ui-tests.yml
+++ b/.github/workflows/run-ui-tests.yml
@@ -33,15 +33,14 @@ jobs:
# Check out current repository
- name: Fetch Sources
- uses: actions/checkout@v2.4.0
+ uses: actions/checkout@v3
- # Setup Java 11 environment for the next steps
+ # Setup Java 17 environment for the next steps
- name: Setup Java
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
distribution: zulu
- java-version: 11
- cache: gradle
+ java-version: 17
# Run IDEA prepared for UI testing
- name: Run IDE
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1366700..4a123ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,11 +3,16 @@
# easy-i18n Changelog
## [Unreleased]
+### Added
+- Support for IntelliJ Platform version 2022.2
+
+### Changes
+- Updated dependencies
## [4.1.1]
-### Fixed
-- AssertionError on translation update
-- Use correct line separator in properties files
+### Fixed
+- AssertionError on translation update
+- Use correct line separator in properties files
- Allow numbers and other data types in properties files
## [4.1.0]
diff --git a/build.gradle.kts b/build.gradle.kts
index 9dfd2a5..e307206 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
// Java support
id("java")
// Kotlin support
- id("org.jetbrains.kotlin.jvm") version "1.6.10"
+ id("org.jetbrains.kotlin.jvm") version "1.7.10"
// Gradle IntelliJ Plugin
- id("org.jetbrains.intellij") version "1.4.0"
+ id("org.jetbrains.intellij") version "1.7.0"
// Gradle Changelog Plugin
id("org.jetbrains.changelog") version "1.3.1"
// Gradle Qodana Plugin
diff --git a/gradle.properties b/gradle.properties
index b1ef377..a647132 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,23 +4,23 @@
pluginGroup = de.marhali.easyi18n
pluginName = easy-i18n
# SemVer format -> https://semver.org
-pluginVersion = 4.1.1
+pluginVersion = 4.2.0
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild = 203
-pluginUntilBuild = 221.*
+pluginUntilBuild = 222.*
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = IU
-platformVersion = 2021.3
+platformVersion = 2022.2
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
-platformPlugins = org.jetbrains.kotlin, JavaScriptLanguage, org.jetbrains.plugins.vue:213.5744.223, com.jetbrains.php:213.5744.279
+platformPlugins = org.jetbrains.kotlin, JavaScriptLanguage, org.jetbrains.plugins.vue:222.3345.111, com.jetbrains.php:222.3345.118
-# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
-javaVersion = 11
+# Java language level used to compile sources and to generate the files for
+javaVersion = 17
# Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 7.4
diff --git a/gradlew b/gradlew
index 744e882..fe1f4e6 100755
--- a/gradlew
+++ b/gradlew
@@ -182,4 +182,4 @@ APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"
\ No newline at end of file
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..477c896 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -86,4 +86,4 @@ exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
-:omega
+:omega
\ No newline at end of file
diff --git a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java
index 3bbfd23..fd981cb 100644
--- a/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java
+++ b/src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java
@@ -28,7 +28,7 @@ public class TranslatorToolWindowFactory implements ToolWindowFactory, DumbAware
@Override
public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
InstanceManager manager = InstanceManager.get(project);
- ContentFactory contentFactory = ContentFactory.SERVICE.getInstance();
+ ContentFactory contentFactory = ContentFactory.getInstance();
// Translations tree view
TreeView treeView = new TreeView(project);