Skip to content

Commit edd6047

Browse files
committed
reverted to last working build
1 parent a146612 commit edd6047

File tree

9 files changed

+24
-299
lines changed

9 files changed

+24
-299
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,6 @@ jobs:
3333
changelog: ${{ steps.properties.outputs.changelog }}
3434
steps:
3535

36-
# Clear Gradle cache
37-
- name: Clear Gradle Cache
38-
run: rm -rf ~/.gradle/caches ~/.gradle/wrapper ~/.gradle/native
39-
40-
# Setup fresh Gradle
41-
- name: Set Up Fresh Gradle User Home
42-
run: ./gradlew clean --refresh-dependencies
43-
4436
# Free GitHub Actions Environment Disk Space
4537
- name: Maximize Build Space
4638
uses: jlumbroso/free-disk-space@main
@@ -56,12 +48,12 @@ jobs:
5648
- name: Gradle Wrapper Validation
5749
uses: gradle/[email protected]
5850

59-
# Setup Java 17 environment for the next steps
51+
# Setup Java 11 environment for the next steps
6052
- name: Setup Java
6153
uses: actions/setup-java@v3
6254
with:
6355
distribution: zulu
64-
java-version: 17
56+
java-version: 11
6557

6658
# Set environment variables
6759
- name: Export Properties

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
with:
2424
ref: ${{ github.event.release.tag_name }}
2525

26-
# Setup Java 17 environment for the next steps
26+
# Setup Java 11 environment for the next steps
2727
- name: Setup Java
2828
uses: actions/setup-java@v3
2929
with:
3030
distribution: zulu
31-
java-version: 17
31+
java-version: 11
3232

3333
# Set environment variables
3434
- name: Export Properties

CHANGELOG.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44

55
## [Unreleased]
66

7-
## [2.0.16]
7+
## [2.0.15]
88

99
### Changed
1010

11-
12-
- Spring 2025 style checker
11+
- Fall 2024 style checker

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
// Java support
77
id("java")
88
// Gradle IntelliJ Plugin
9-
id("org.jetbrains.intellij") version "1.15.0"
9+
id("org.jetbrains.intellij") version "1.8.0"
1010
// Gradle Changelog Plugin
1111
id("org.jetbrains.changelog") version "1.3.1"
1212
// Gradle Qodana Plugin

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
pluginGroup = edu.berkeley.cs61b.plugin
44
pluginName = CS 61B
55
# SemVer format -> https://semver.org
6-
pluginVersion = 2.0.16
6+
pluginVersion = 2.0.15
77

88
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
9-
pluginSinceBuild = 241
9+
pluginSinceBuild = 213
1010

1111
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#intellij-extension
1212
platformType = IC
13-
platformVersion = 2024.1.7
13+
platformVersion = 2022.2.1
1414

1515
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1616
# Example: platformPlugins = com.intellij.java, com.jetbrains.php:203.4449.22

src/main/java/edu/berkeley/cs61b/plugin/CheckStyleAction.java

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
package edu.berkeley.cs61b.plugin;
22

3-
import java.io.BufferedReader;
4-
import java.io.File;
5-
import java.io.IOException;
6-
import java.io.InputStream;
7-
import java.io.InputStreamReader;
8-
import java.nio.file.Path;
9-
import java.nio.file.Paths;
10-
import java.util.ArrayList;
11-
import java.util.Collections;
12-
import java.util.LinkedList;
13-
import java.util.List;
14-
15-
import org.jetbrains.annotations.NotNull;
16-
import org.xml.sax.InputSource;
17-
183
import com.intellij.execution.filters.OpenFileHyperlinkInfo;
194
import com.intellij.execution.ui.ConsoleView;
205
import com.intellij.execution.ui.ConsoleViewContentType;
21-
import com.intellij.openapi.actionSystem.ActionUpdateThread;
226
import com.intellij.openapi.actionSystem.AnAction;
237
import com.intellij.openapi.actionSystem.AnActionEvent;
248
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -36,6 +20,19 @@
3620
import com.puppycrawl.tools.checkstyle.api.AuditEvent;
3721
import com.puppycrawl.tools.checkstyle.api.AuditListener;
3822
import com.puppycrawl.tools.checkstyle.api.Configuration;
23+
import org.xml.sax.InputSource;
24+
25+
import java.io.BufferedReader;
26+
import java.io.File;
27+
import java.io.IOException;
28+
import java.io.InputStream;
29+
import java.io.InputStreamReader;
30+
import java.nio.file.Path;
31+
import java.nio.file.Paths;
32+
import java.util.ArrayList;
33+
import java.util.Collections;
34+
import java.util.LinkedList;
35+
import java.util.List;
3936

4037
public class CheckStyleAction extends AnAction {
4138
private static final String CONFIG_ROOT = "style_config/";
@@ -87,11 +84,6 @@ public void actionPerformed(AnActionEvent event) {
8784
}
8885
}
8986

90-
@Override
91-
public @NotNull ActionUpdateThread getActionUpdateThread() {
92-
return ActionUpdateThread.BGT;
93-
}
94-
9587
private void collectFiles(VirtualFile[] parent, List<File> list) {
9688
LinkedList<VirtualFile> sources = new LinkedList<>();
9789
Collections.addAll(sources, parent);
Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
package edu.berkeley.cs61b.plugin;
22

3-
import org.jetbrains.annotations.NotNull;
4-
53
import com.intellij.ide.util.PropertiesComponent;
6-
import com.intellij.openapi.actionSystem.ActionUpdateThread;
74
import com.intellij.openapi.actionSystem.AnAction;
85
import com.intellij.openapi.actionSystem.AnActionEvent;
96
import com.intellij.openapi.ui.DialogWrapper;
7+
import org.jetbrains.annotations.NotNull;
108

119
public class SettingsAction extends AnAction {
1210
@Override
@@ -21,9 +19,4 @@ public void actionPerformed(@NotNull AnActionEvent e) {
2119
props.setValue(PluginUtils.KEY_SEMESTER, form.getSemesterField().getText());
2220
}
2321
}
24-
25-
@Override
26-
public @NotNull ActionUpdateThread getActionUpdateThread() {
27-
return ActionUpdateThread.BGT;
28-
}
2922
}

0 commit comments

Comments
 (0)