From 1f31c9a0079c2a676efa7664fd7cc17e66f4d63b Mon Sep 17 00:00:00 2001 From: Enzo Mallard Date: Thu, 5 Dec 2024 21:43:59 +0100 Subject: [PATCH] fix: Back to jdk 17 + Fix some deprecated methods --- .github/workflows/build.yml | 10 +++++--- .github/workflows/release.yml | 2 +- .github/workflows/run-ui-tests.yml | 2 +- build.gradle.kts | 2 +- gradle.properties | 6 ++--- gradle/libs.versions.toml | 8 +----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../NgTranslateToolsetConfigurable.kt | 25 ++++++++----------- 8 files changed, 24 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2634bd4..6f7b5de 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 21 + java-version: 17 # Setup Gradle - name: Setup Gradle @@ -121,7 +121,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 21 + java-version: 17 # Setup Gradle - name: Setup Gradle @@ -155,6 +155,7 @@ jobs: checks: write pull-requests: write steps: + # Free GitHub Actions Environment Disk Space - name: Maximize Build Space uses: jlumbroso/free-disk-space@main @@ -174,7 +175,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 21 + java-version: 17 # Run Qodana inspections - name: Qodana - Code Inspection @@ -188,6 +189,7 @@ jobs: needs: [ build ] runs-on: ubuntu-latest steps: + # Free GitHub Actions Environment Disk Space - name: Maximize Build Space uses: jlumbroso/free-disk-space@main @@ -204,7 +206,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 21 + java-version: 17 # Setup Gradle - name: Setup Gradle diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa613e0..b14a6a4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 21 + java-version: 17 # Setup Gradle - name: Setup Gradle diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 230d6c5..c901413 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -40,7 +40,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: zulu - java-version: 21 + java-version: 17 # Setup Gradle - name: Setup Gradle diff --git a/build.gradle.kts b/build.gradle.kts index 2eb0bec..a84e63d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ dependencies { // Set the JVM language level used to build the project. kotlin { - jvmToolchain(21) + jvmToolchain(17) } // Configure IntelliJ Platform Gradle Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-extension.html diff --git a/gradle.properties b/gradle.properties index f4c4db2..45e71e0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ pluginRepositoryUrl = https://plugins.jetbrains.com/plugin/17450-ngtranslate-too # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 242 +pluginSinceBuild = 241 pluginUntilBuild = 243.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-intellij-platform-gradle-plugin-dependencies-extension.html#custom-target-platforms @@ -22,11 +22,11 @@ platformPlugins = platformBundledPlugins = JavaScript, AngularJS # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.10.2 +gradleVersion = 8.11.1 # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html org.gradle.configuration-cache = true -kotlin.stdlib.default.dependency = true +kotlin.stdlib.default.dependency = false # Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html org.gradle.caching = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9a9fe08..3a1fd5b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,17 +1,11 @@ [versions] -# libraries -annotations = "24.1.0" - # plugins kotlin = "1.9.25" changelog = "2.2.1" intelliJPlatform = "2.1.0" -qodana = "2024.2.3" +qodana = "2024.2.6" kover = "0.8.3" -[libraries] -annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" } - [plugins] changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" } intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "intelliJPlatform" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/kotlin/fr/enzomallard/ngxtranslatetoolset/configuration/NgTranslateToolsetConfigurable.kt b/src/main/kotlin/fr/enzomallard/ngxtranslatetoolset/configuration/NgTranslateToolsetConfigurable.kt index e77f7dc..3ebbfd1 100644 --- a/src/main/kotlin/fr/enzomallard/ngxtranslatetoolset/configuration/NgTranslateToolsetConfigurable.kt +++ b/src/main/kotlin/fr/enzomallard/ngxtranslatetoolset/configuration/NgTranslateToolsetConfigurable.kt @@ -47,24 +47,19 @@ class NgTranslateToolsetConfigurable(private val project: Project) : SearchableC } private fun createLangInput() = TextFieldWithBrowseButton().apply { - - addBrowseFolderListener( - NgTranslateToolsetBundle.message("configuration.modal.title.default_translation"), - NgTranslateToolsetBundle.message("configuration.modal.description.default_translation"), - project, - FileChooserDescriptor(true, false, false, false, false, false) - .withFileFilter { it.isJsonFile() } - ) + val descriptor = FileChooserDescriptor(true, false, false, false, false, false) + .withFileFilter(VirtualFile::isJsonFile) + .withTitle(NgTranslateToolsetBundle.message("configuration.modal.title.default_translation")) + .withDescription(NgTranslateToolsetBundle.message("configuration.modal.description.default_translation")) + addBrowseFolderListener(project, descriptor) } private fun createI18PathInput() = TextFieldWithBrowseButton().apply { - addBrowseFolderListener( - NgTranslateToolsetBundle.message("configuration.modal.title.translation_folder"), - NgTranslateToolsetBundle.message("configuration.modal.description.translation_folder"), - project, - FileChooserDescriptor(false, true, false, false, false, false) - .withFileFilter(VirtualFile::isJsonFolder) - ) + val descriptor = FileChooserDescriptor(false, true, false, false, false, false) + .withFileFilter(VirtualFile::isJsonFolder) + .withTitle(NgTranslateToolsetBundle.message("configuration.modal.title.translation_folder")) + .withDescription(NgTranslateToolsetBundle.message("configuration.modal.description.translation_folder")) + addBrowseFolderListener(project, descriptor) } override fun isModified(): Boolean {