Skip to content

Commit ad39aa7

Browse files
authored
Merge pull request #98 from xdev-software/develop
Release
2 parents 68bba69 + b1d9929 commit ad39aa7

File tree

10 files changed

+54
-41
lines changed

10 files changed

+54
-41
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,12 @@ jobs:
158158
git push origin
159159
160160
- name: pull-request
161-
uses: repo-sync/pull-request@v2
162-
with:
163-
destination_branch: "develop"
164-
pr_title: "Sync back"
165-
pr_body: "An automated PR to sync changes back"
161+
env:
162+
GH_TOKEN: ${{ github.token }}
163+
run: |
164+
gh_pr_up() {
165+
gh pr create "$@" || gh pr edit "$@"
166+
}
167+
gh_pr_up -B "develop" \
168+
--title "Sync back" \
169+
--body "An automated PR to sync changes back"

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.2.1
2+
* Fixed ``ToggleAnAction must override getActionUpdateThread`` warning inside IntelliJ 2024+
3+
* Dropped support for IntelliJ versions < 2023.2
4+
15
## 1.2.0
26
* Run GlobalProcessors (e.g. Reformat) last so that code is formatted correctly #90
37
* Dropped support for IntelliJ versions < 2023

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ pluginName=Save Actions X
55
pluginVersion=1.2.1-SNAPSHOT
66
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
77
platformType=IC
8-
platformVersion=2023.1.6
8+
platformVersion=2023.2.6
99
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1010
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22
1111
platformPlugins=java
1212
# Gradle Releases -> https://github.com/gradle/gradle/releases
13-
gradleVersion=8.5
13+
gradleVersion=8.7
1414
# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
1515
org.gradle.configuration-cache=true
1616
# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html

gradle/wrapper/gradle-wrapper.jar

-9 Bytes
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew.bat

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
4343
%JAVA_EXE% -version >NUL 2>&1
4444
if %ERRORLEVEL% equ 0 goto execute
4545

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
46+
echo. 1>&2
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
48+
echo. 1>&2
49+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
50+
echo location of your Java installation. 1>&2
5151

5252
goto fail
5353

@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5757

5858
if exist "%JAVA_EXE%" goto execute
5959

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
60+
echo. 1>&2
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
62+
echo. 1>&2
63+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
64+
echo location of your Java installation. 1>&2
6565

6666
goto fail
6767

renovate.json5

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"rebaseWhen": "behind-base-branch",
4+
"packageRules": [
5+
{
6+
"description": "Workaround, see https://github.com/gradle/gradle/issues/27035",
7+
"matchPackagePatterns": [
8+
"^com.google.guava:guava"
9+
],
10+
"datasources": [
11+
"maven"
12+
],
13+
"matchCurrentVersion": "0",
14+
"enabled": false
15+
}
16+
]
17+
}

src/main/java/software/xdev/saveactions/core/action/ToggleAnAction.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import static software.xdev.saveactions.model.Action.activate;
44

5+
import org.jetbrains.annotations.NotNull;
6+
7+
import com.intellij.openapi.actionSystem.ActionUpdateThread;
58
import com.intellij.openapi.actionSystem.AnActionEvent;
69
import com.intellij.openapi.actionSystem.ToggleAction;
710
import com.intellij.openapi.project.DumbAware;
@@ -37,4 +40,10 @@ public void setSelected(final AnActionEvent event, final boolean state)
3740
storage.setEnabled(activate, state);
3841
}
3942
}
43+
44+
@Override
45+
public @NotNull ActionUpdateThread getActionUpdateThread()
46+
{
47+
return ActionUpdateThread.BGT;
48+
}
4049
}

src/main/resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</change-notes>
2020

2121
<!-- https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -->
22-
<idea-version since-build="231"/>
22+
<idea-version since-build="232"/>
2323

2424
<!-- Other product support activated in plugin page during upload at https://plugins.jetbrains.com -->
2525
<depends optional="true" config-file="plugin-java.xml">com.intellij.modules.java</depends>

0 commit comments

Comments
 (0)