diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 020db52..0e33435 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,14 +33,6 @@ jobs: changelog: ${{ steps.properties.outputs.changelog }} steps: - # Clear Gradle cache - - name: Clear Gradle Cache - run: rm -rf ~/.gradle/caches ~/.gradle/wrapper ~/.gradle/native - - # Setup fresh Gradle - - name: Set Up Fresh Gradle User Home - run: ./gradlew clean --refresh-dependencies - # Free GitHub Actions Environment Disk Space - name: Maximize Build Space uses: jlumbroso/free-disk-space@main @@ -56,12 +48,12 @@ jobs: - name: Gradle Wrapper Validation uses: gradle/wrapper-validation-action@v1.0.4 - # Setup Java 17 environment for the next steps + # Setup Java 11 environment for the next steps - name: Setup Java uses: actions/setup-java@v3 with: distribution: zulu - java-version: 17 + java-version: 11 # Set environment variables - name: Export Properties diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7334c20..b31a05b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,12 +23,12 @@ jobs: with: ref: ${{ github.event.release.tag_name }} - # Setup Java 17 environment for the next steps + # Setup Java 11 environment for the next steps - name: Setup Java uses: actions/setup-java@v3 with: distribution: zulu - java-version: 17 + java-version: 11 # Set environment variables - name: Export Properties diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f812b5..8e952f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,8 @@ ## [Unreleased] -## [2.0.16] +## [2.0.15] ### Changed - -- Spring 2025 style checker +- Fall 2024 style checker diff --git a/build.gradle.kts b/build.gradle.kts index 44a5510..7c244c1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,7 @@ plugins { // Java support id("java") // Gradle IntelliJ Plugin - id("org.jetbrains.intellij") version "1.15.0" + id("org.jetbrains.intellij") version "1.8.0" // Gradle Changelog Plugin id("org.jetbrains.changelog") version "1.3.1" // Gradle Qodana Plugin diff --git a/gradle.properties b/gradle.properties index 3a5c9d0..96e816a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,14 +3,14 @@ pluginGroup = edu.berkeley.cs61b.plugin pluginName = CS 61B # SemVer format -> https://semver.org -pluginVersion = 2.0.16 +pluginVersion = 2.0.15 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html -pluginSinceBuild = 241 +pluginSinceBuild = 213 # IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension platformType = IC -platformVersion = 2024.1.7 +platformVersion = 2022.2.1 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html # Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22 diff --git a/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java b/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java index dc883ff..76b18d9 100644 --- a/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java +++ b/src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java @@ -1,24 +1,8 @@ package edu.berkeley.cs61b.plugin; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedList; -import java.util.List; - -import org.jetbrains.annotations.NotNull; -import org.xml.sax.InputSource; - import com.intellij.execution.filters.OpenFileHyperlinkInfo; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.ConsoleViewContentType; -import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; @@ -36,6 +20,19 @@ import com.puppycrawl.tools.checkstyle.api.AuditEvent; import com.puppycrawl.tools.checkstyle.api.AuditListener; import com.puppycrawl.tools.checkstyle.api.Configuration; +import org.xml.sax.InputSource; + +import java.io.BufferedReader; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedList; +import java.util.List; public class CheckStyleAction extends AnAction { private static final String CONFIG_ROOT = "style_config/"; @@ -87,11 +84,6 @@ public void actionPerformed(AnActionEvent event) { } } - @Override - public @NotNull ActionUpdateThread getActionUpdateThread() { - return ActionUpdateThread.BGT; - } - private void collectFiles(VirtualFile[] parent, List list) { LinkedList sources = new LinkedList<>(); Collections.addAll(sources, parent); diff --git a/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java b/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java index 13020d4..ed9c61b 100644 --- a/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java +++ b/src/main/java/edu/berkeley/cs61b/plugin/SettingsAction.java @@ -1,12 +1,10 @@ package edu.berkeley.cs61b.plugin; -import org.jetbrains.annotations.NotNull; - import com.intellij.ide.util.PropertiesComponent; -import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.DialogWrapper; +import org.jetbrains.annotations.NotNull; public class SettingsAction extends AnAction { @Override @@ -21,9 +19,4 @@ public void actionPerformed(@NotNull AnActionEvent e) { props.setValue(PluginUtils.KEY_SEMESTER, form.getSemesterField().getText()); } } - - @Override - public @NotNull ActionUpdateThread getActionUpdateThread() { - return ActionUpdateThread.BGT; - } } diff --git a/src/main/resources/style_config/cs61b_sp25_checks.xml b/src/main/resources/style_config/cs61b_sp25_checks.xml deleted file mode 100644 index 51a2a5d..0000000 --- a/src/main/resources/style_config/cs61b_sp25_checks.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/resources/style_config/index.txt b/src/main/resources/style_config/index.txt index 106cf28..56d5cea 100644 --- a/src/main/resources/style_config/index.txt +++ b/src/main/resources/style_config/index.txt @@ -14,7 +14,6 @@ fa21 cs61b_sp20_checks.xml cs61b_sp20_suppressions.xml sp22 cs61b_sp20_checks.xml cs61b_sp20_suppressions.xml # Hug semesters: -sp25 cs61b_sp25_checks.xml no_suppressions.xml fa24 cs61b_fa24_checks.xml no_suppressions.xml sp24 cs61b_sp24_checks.xml no_suppressions.xml fa23 cs61b_fa23_checks.xml no_suppressions.xml