Merge pull request #33 from lipiridi/feature/2024.3-compatibility

Feature/2024.3 compatibility

.github/workflows/build.yml

@@ -53,9 +53,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
@@ -115,9 +113,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 tests
       - name: Run Tests
@@ -164,9 +160,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
 
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache

.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

.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

.run/Run Plugin.run.xml

@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
+    <log_file alias="IDE logs" path="$PROJECT_DIR$/build/idea-sandbox/*/log/idea.log" show_all="true" />
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -19,6 +19,7 @@
     <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
     <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
     <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
     <method v="2" />
   </configuration>
-</component>
+</component>

CHANGELOG.md

@@ -4,6 +4,11 @@
 
 ## [Unreleased]
 
+### Changed
+
+- [#32](https://github.com/lipiridi/spotless-applier/issues/32) Update version compatibility
+- [#32](https://github.com/lipiridi/spotless-applier/issues/32) Store pre-commit state in workspace
+
 ## [1.1.3] - 2024-10-10
 
 ### Changed

README.md

@@ -5,7 +5,7 @@
 [![Downloads](https://img.shields.io/jetbrains/plugin/d/22455.svg)](https://plugins.jetbrains.com/plugin/22455)
 
 <!-- Plugin description -->
-> ⚠️ Version 1.1.2 is built for Intellij IDEA 2024.2 and doesn't support the pre-commit feature for Gradle projects due to this bug https://youtrack.jetbrains.com/issue/IDEA-327879
+> ⚠️ Versions >= 1.1.2 are built for Intellij IDEA >= 2024.2 and doesn't support the pre-commit feature for Gradle projects due to this bug https://youtrack.jetbrains.com/issue/IDEA-327879
 >
 > Version 1.1.1 supports the pre-commit check properly but is only compatible with Intellij IDEA 2024.1.* versions.
 

build.gradle.kts

@@ -5,8 +5,8 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType
 
 plugins {
     id("java")
-    id("org.jetbrains.kotlin.jvm") version "2.0.10"
-    id("org.jetbrains.intellij.platform") version "2.0.1"
+    id("org.jetbrains.kotlin.jvm") version "2.0.21"
+    id("org.jetbrains.intellij.platform") version "2.1.0"
     id("org.jetbrains.changelog") version "2.2.1"
     id("org.jetbrains.kotlinx.kover") version "0.8.3"
     id("com.diffplug.spotless") version "6.25.0"

gradle.properties

@@ -4,15 +4,15 @@ pluginName=Spotless Applier
 pluginRepositoryUrl=https://github.com/lipiridi/spotless-applier
 
 # SemVer format -> https://semver.org
-pluginVersion=1.1.3
+pluginVersion=1.1.4
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
-pluginSinceBuild=242
-pluginUntilBuild=242.*
+pluginSinceBuild=243
+pluginUntilBuild=243.*
 
 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
 platformType=IC
-platformVersion=2024.2
+platformVersion=2024.3
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP
@@ -21,7 +21,7 @@ platformPlugins=
 platformBundledPlugins=com.intellij.java,com.intellij.gradle,org.jetbrains.idea.maven
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion=8.9
+gradleVersion=8.11
 
 # Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency=false

src/main/java/com/github/lipiridi/spotless/applier/trigger/SpotlessApplierCheckinHandlerState.java

@@ -0,0 +1,28 @@
+package com.github.lipiridi.spotless.applier.trigger;
+
+import com.intellij.openapi.components.*;
+import com.intellij.openapi.project.Project;
+import com.intellij.util.xmlb.XmlSerializerUtil;
+import org.jetbrains.annotations.NotNull;
+
+@Service(Service.Level.PROJECT)
+@State(name = "SpotlessApplierCheckinHandler", storages = @Storage(StoragePathMacros.WORKSPACE_FILE))
+public final class SpotlessApplierCheckinHandlerState
+        implements PersistentStateComponent<SpotlessApplierCheckinHandlerState> {
+
+    public boolean preCommitSpotlessFormating;
+
+    public static SpotlessApplierCheckinHandlerState getInstance(Project project) {
+        return project.getService(SpotlessApplierCheckinHandlerState.class);
+    }
+
+    @Override
+    public SpotlessApplierCheckinHandlerState getState() {
+        return this;
+    }
+
+    @Override
+    public void loadState(@NotNull SpotlessApplierCheckinHandlerState state) {
+        XmlSerializerUtil.copyBean(state, this);
+    }
+}

src/main/java/com/github/lipiridi/spotless/applier/trigger/SpotlessCheckinHandler.java

@@ -3,7 +3,6 @@
 import com.github.lipiridi.spotless.applier.ModuleInfo;
 import com.github.lipiridi.spotless.applier.ReformatProcessor;
 import com.github.lipiridi.spotless.applier.enums.BuildTool;
-import com.github.lipiridi.spotless.applier.ui.settings.SpotlessApplierSettingsState;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
@@ -25,11 +24,12 @@
 
 public class SpotlessCheckinHandler extends CheckinHandler {
     private static final Logger LOGGER = Logger.getInstance(SpotlessCheckinHandler.class);
-    private final SpotlessApplierSettingsState spotlessSettings = SpotlessApplierSettingsState.getInstance();
+    private final SpotlessApplierCheckinHandlerState spotlessSettings;
     private final Project project;
 
     public SpotlessCheckinHandler(Project project) {
         this.project = project;
+        this.spotlessSettings = SpotlessApplierCheckinHandlerState.getInstance(project);
     }
 
     @Override

src/main/java/com/github/lipiridi/spotless/applier/ui/settings/SpotlessApplierSettingsState.java

@@ -17,7 +17,6 @@ public final class SpotlessApplierSettingsState implements PersistentStateCompon
     public boolean prohibitGradleCache;
     public boolean optimizeImportsBeforeApplying;
     public boolean prohibitImportsWithAsterisk;
-    public boolean preCommitSpotlessFormating;
 
     public static SpotlessApplierSettingsState getInstance() {
         return ApplicationManager.getApplication().getService(SpotlessApplierSettingsState.class);