diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aa06cb2..5174ab9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,9 +33,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Set environment variables - name: Export Properties diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml index 6b60acd..c901413 100644 --- a/.github/workflows/run-ui-tests.yml +++ b/.github/workflows/run-ui-tests.yml @@ -44,9 +44,7 @@ jobs: # Setup Gradle - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3 - with: - gradle-home-cache-cleanup: true + uses: gradle/actions/setup-gradle@v4 # Run IDEA prepared for UI testing - name: Run IDE diff --git a/.run/Run Plugin.run.xml b/.run/Run Plugin.run.xml index d15ff68..00a760e 100644 --- a/.run/Run Plugin.run.xml +++ b/.run/Run Plugin.run.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/CHANGELOG.md b/CHANGELOG.md index e35a16b..8a83730 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,12 @@ ## [1.4.0] ### Changed -- #18 Added support for "Squirrel Method" (Chinese) (https://rime.im) on macOS. -- #20 Added support for "Russian - PC" on macOS. -- #21 Fixed color settings save bug; color settings now save correctly. +- #18 Add support for "Squirrel Method" (Chinese) (https://rime.im) on macOS. +- #20 Add support for "Russian - PC" on macOS. +- #21 Fix color settings save bug; color settings now save correctly. + +### For Contributors and Developers +- #24 Update IntelliJ Plugin to v2.0.2. ## [1.3.1] - 2024-08-26 diff --git a/build.gradle.kts b/build.gradle.kts index 0413275..06816ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,5 @@ import org.jetbrains.changelog.Changelog import org.jetbrains.changelog.markdownToHTML -import org.jetbrains.intellij.platform.gradle.Constants.Constraints import org.jetbrains.intellij.platform.gradle.TestFrameworkType plugins { @@ -136,19 +135,23 @@ tasks { } } -val runIdeForUiTests by intellijPlatformTesting.runIde.registering { - task { - jvmArgumentProviders += CommandLineArgumentProvider { - listOf( - "-Drobot-server.port=8082", - "-Dide.mac.message.dialogs.as.sheets=false", - "-Djb.privacy.policy.text=", - "-Djb.consents.confirmation.enabled=false", - ) - } - } +intellijPlatformTesting { + runIde { + register("runIdeForUiTests") { + task { + jvmArgumentProviders += CommandLineArgumentProvider { + listOf( + "-Drobot-server.port=8082", + "-Dide.mac.message.dialogs.as.sheets=false", + "-Djb.privacy.policy.text=", + "-Djb.consents.confirmation.enabled=false", + ) + } + } - plugins { - robotServerPlugin(Constraints.LATEST_VERSION) + plugins { + robotServerPlugin() + } + } } } diff --git a/gradle.properties b/gradle.properties index 17c3f3a..51e6542 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ pluginUntilBuild = 242.* # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension platformType = IC -platformVersion = 2023.2.7 +platformVersion = 2023.3.8 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 @@ -20,7 +20,7 @@ platformPlugins = platformBundledPlugins = # Gradle Releases -> https://github.com/gradle/gradle/releases -gradleVersion = 8.9 +gradleVersion = 8.10.2 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib kotlin.stdlib.default.dependency = false diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1d97bec..4c2f43f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,10 +4,10 @@ junit = "4.13.2" # plugins changelog = "2.2.1" -intelliJPlatform = "2.0.0" -kotlin = "1.9.24" -kover = "0.8.1" -qodana = "2024.1.5" +intelliJPlatform = "2.1.0" +kotlin = "1.9.25" +kover = "0.8.3" +qodana = "2024.2.3" [libraries] junit = { group = "junit", name = "junit", version.ref = "junit" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..df97d72 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/qodana.yml b/qodana.yml index cbf640f..a502427 100644 --- a/qodana.yml +++ b/qodana.yml @@ -2,7 +2,7 @@ # https://www.jetbrains.com/help/qodana/qodana-yaml.html version: 1.0 -linter: jetbrains/qodana-jvm-community:latest +linter: jetbrains/qodana-jvm-community:2024.2 projectJDK: "17" profile: name: qodana.recommended diff --git a/settings.gradle.kts b/settings.gradle.kts index a9c5215..2140ea3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,5 @@ rootProject.name = "kursor" + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +}