RedGuy/easy-18in
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #160 from marhali/next

Browse Source 
Next
This commit is contained in:
Marcel 2022-07-30 14:50:06 +02:00 committed by GitHub
commit 182b8eb9fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/build.yml vendored
View File

@ -35,19 +35,18 @@ jobs:
# Check out current repository # Check out current repository
- name: Fetch Sources - name: Fetch Sources
uses: actions/checkout@v2.4.0 uses: actions/checkout@v3
# Validate wrapper # Validate wrapper
- name: Gradle Wrapper Validation - name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.0.4 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 - name: Setup Java
uses: actions/setup-java@v2 uses: actions/setup-java@v3
with: with:
distribution: zulu distribution: zulu
java-version: 11 java-version: 17
cache: gradle
# Set environment variables # Set environment variables
- name: Export Properties - name: Export Properties
@ -76,14 +75,14 @@ jobs:
# Collect Tests Result of failed tests # Collect Tests Result of failed tests
- name: Collect Tests Result - name: Collect Tests Result
if: ${{ failure() }} if: ${{ failure() }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: tests-result name: tests-result
path: ${{ github.workspace }}/build/reports/tests path: ${{ github.workspace }}/build/reports/tests
# Cache Plugin Verifier IDEs # Cache Plugin Verifier IDEs
- name: Setup Plugin Verifier IDEs Cache - name: Setup Plugin Verifier IDEs Cache
uses: actions/cache@v2.1.7 uses: actions/cache@v3
with: with:
path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }} key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@ -95,14 +94,14 @@ jobs:
# Collect Plugin Verifier Result # Collect Plugin Verifier Result
- name: Collect Plugin Verifier Result - name: Collect Plugin Verifier Result
if: ${{ always() }} if: ${{ always() }}
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: pluginVerifier-result name: pluginVerifier-result
path: ${{ github.workspace }}/build/reports/pluginVerifier path: ${{ github.workspace }}/build/reports/pluginVerifier
# Run Qodana inspections # Run Qodana inspections
- name: Qodana - Code Inspection - 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 # Prepare plugin archive content for creating artifact
- name: Prepare Plugin Artifact - name: Prepare Plugin Artifact
@ -117,7 +116,7 @@ jobs:
# Store already-built plugin as an artifact for downloading # Store already-built plugin as an artifact for downloading
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v2.2.4 uses: actions/upload-artifact@v3
with: with:
name: ${{ steps.artifact.outputs.filename }} name: ${{ steps.artifact.outputs.filename }}
path: ./build/distributions/content/*/* path: ./build/distributions/content/*/*
@ -129,11 +128,13 @@ jobs:
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
needs: build needs: build
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: write
steps: steps:
# Check out current repository # Check out current repository
- name: Fetch Sources - 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 # Remove old release drafts by using the curl request for the available releases with draft flag
- name: Remove Old Release Drafts - name: Remove Old Release Drafts

12
.github/workflows/release.yml vendored
View File

@ -12,21 +12,23 @@ jobs:
release: release:
name: Publish Plugin name: Publish Plugin
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps: steps:
# Check out current repository # Check out current repository
- name: Fetch Sources - name: Fetch Sources
uses: actions/checkout@v2.4.0 uses: actions/checkout@v3
with: with:
ref: ${{ github.event.release.tag_name }} 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 - name: Setup Java
uses: actions/setup-java@v2 uses: actions/setup-java@v3
with: with:
distribution: zulu distribution: zulu
java-version: 11 java-version: 17
cache: gradle
# Set environment variables # Set environment variables
- name: Export Properties - name: Export Properties

9
.github/workflows/run-ui-tests.yml vendored
View File

@ -33,15 +33,14 @@ jobs:
# Check out current repository # Check out current repository
- name: Fetch Sources - 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 - name: Setup Java
uses: actions/setup-java@v2 uses: actions/setup-java@v3
with: with:
distribution: zulu distribution: zulu
java-version: 11 java-version: 17
cache: gradle
# Run IDEA prepared for UI testing # Run IDEA prepared for UI testing
- name: Run IDE - name: Run IDE

11
CHANGELOG.md
View File

@ -3,11 +3,16 @@
# easy-i18n Changelog # easy-i18n Changelog
## [Unreleased] ## [Unreleased]
### Added
- Support for IntelliJ Platform version 2022.2
### Changes
- Updated dependencies
## [4.1.1] ## [4.1.1]
### Fixed ### Fixed
- AssertionError on translation update - AssertionError on translation update
- Use correct line separator in <kbd>properties</kbd> files - Use correct line separator in <kbd>properties</kbd> files
- Allow numbers and other data types in <kbd>properties</kbd> files - Allow numbers and other data types in <kbd>properties</kbd> files
## [4.1.0] ## [4.1.0]

4
build.gradle.kts
View File

@ -7,9 +7,9 @@ plugins {
// Java support // Java support
id("java") id("java")
// Kotlin support // Kotlin support
id("org.jetbrains.kotlin.jvm") version "1.6.10" id("org.jetbrains.kotlin.jvm") version "1.7.10"
// Gradle IntelliJ Plugin // Gradle IntelliJ Plugin
id("org.jetbrains.intellij") version "1.4.0" id("org.jetbrains.intellij") version "1.7.0"
// Gradle Changelog Plugin // Gradle Changelog Plugin
id("org.jetbrains.changelog") version "1.3.1" id("org.jetbrains.changelog") version "1.3.1"
// Gradle Qodana Plugin // Gradle Qodana Plugin

12
gradle.properties
View File

@ -4,23 +4,23 @@
pluginGroup = de.marhali.easyi18n pluginGroup = de.marhali.easyi18n
pluginName = easy-i18n pluginName = easy-i18n
# SemVer format -> https://semver.org # SemVer format -> https://semver.org
pluginVersion = 4.1.1 pluginVersion = 4.2.0
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions. # for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild = 203 pluginSinceBuild = 203
pluginUntilBuild = 221.* pluginUntilBuild = 222.*
# IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
platformType = IU platformType = IU
platformVersion = 2021.3 platformVersion = 2022.2
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 # 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 # Java language level used to compile sources and to generate the files for
javaVersion = 11 javaVersion = 17
# Gradle Releases -> https://github.com/gradle/gradle/releases # Gradle Releases -> https://github.com/gradle/gradle/releases
gradleVersion = 7.4 gradleVersion = 7.4

2
gradlew vendored
View File

@ -182,4 +182,4 @@ APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules # 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" 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" "$@"

2
gradlew.bat vendored
View File

@ -86,4 +86,4 @@ exit /b 1
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
:omega :omega

2
src/main/java/de/marhali/easyi18n/service/TranslatorToolWindowFactory.java
View File

@ -28,7 +28,7 @@ public class TranslatorToolWindowFactory implements ToolWindowFactory, DumbAware
@Override @Override
public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) { public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
InstanceManager manager = InstanceManager.get(project); InstanceManager manager = InstanceManager.get(project);
ContentFactory contentFactory = ContentFactory.SERVICE.getInstance(); ContentFactory contentFactory = ContentFactory.getInstance();
// Translations tree view // Translations tree view
TreeView treeView = new TreeView(project); TreeView treeView = new TreeView(project);