Skip to content

Update IntelliJ versions: eapOfLatestSupportedMajor to 233.9102.97-EAP-SNAPSHOT #1739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2023
Merged

Update IntelliJ versions: eapOfLatestSupportedMajor to 233.9102.97-EAP-SNAPSHOT #1739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3bfa0f2
Update IntelliJ versions: eapOfLatestSupportedMajor to 233.9102.97-EA…
git-machete-bot Oct 7, 2023
40489cf
Upgrade `org.apache.commons.{lang => lang3}.exception`
PawelLipski Oct 9, 2023
0118cec
Remove references to `DebugLogManager` from UI tests
PawelLipski Oct 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/checker/org.apache.commons.astub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.checkerframework.checker.nullness.qual.Nullable;
import org.checkerframework.checker.nullness.qual.PolyNull;

package org.apache.commons.lang.exception;
package org.apache.commons.lang3.exception;

class ExceptionUtils {
static @Nullable String getRootCauseMessage(Throwable th);
Expand Down
2 changes: 1 addition & 1 deletion ...gitmachete/frontend/ui/impl/backgroundables/GitMacheteRepositoryUpdateBackgroundable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import lombok.CustomLog;
import lombok.experimental.ExtensionMethod;
import lombok.val;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.checkerframework.checker.guieffect.qual.UI;
import org.checkerframework.checker.index.qual.Positive;
import org.checkerframework.checker.nullness.qual.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion intellij-versions.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eapOfLatestSupportedMajor=
eapOfLatestSupportedMajor=233.9102.97-EAP-SNAPSHOT
earliestSupportedMajor=2022.2
latestMinorsOfOldSupportedMajors=2022.2.5,2022.3.3,2023.1.5
latestStable=2023.2.2
2 changes: 1 addition & 1 deletion src/test/java/com/virtuslab/archunit/ForbiddenClassesTestSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public void no_classes_should_depend_on_java_collections() {
public void no_classes_should_depend_on_org_apache_commons_lang_NotImplementedException() {
noClasses()
.should()
.dependOnClassesThat().areAssignableTo(org.apache.commons.lang.NotImplementedException.class)
.dependOnClassesThat().areAssignableTo(org.apache.commons.lang3.NotImplementedException.class)
.because("io.vavr.NotImplementedError should be used instead of apache-commons NotImplementedException")
.check(productionClasses);
}
Expand Down
12 changes: 1 addition & 11 deletions src/uiTest/resources/ide.rhino.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
importClass(java.lang.System);
importClass(java.util.Collections);

importClass(com.intellij.diagnostic.DebugLogManager);
importClass(com.intellij.ide.GeneralSettings);
importClass(com.intellij.ide.impl.ProjectUtil);
importClass(com.intellij.ide.plugins.PluginManagerCore);
Expand All @@ -14,19 +13,10 @@ importClass(com.intellij.openapi.progress.ProgressManager);

// Do not run any of the methods on the UI thread.
function Ide() {
this.configure = function (enableDebugLog) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#1742

this.configure = function () {
const settings = GeneralSettings.getInstance();
settings.setConfirmExit(false);
settings.setShowTipsOnStartup(false);

const logCategories = new LinkedList();
if (enableDebugLog) {
logCategories.add(new DebugLogManager.Category('com.virtuslab', DebugLogManager.DebugLogLevel.DEBUG))
}

// `applyCategories` is non-persistent (so the categories don't stick for the future IDE runs), unlike `saveCategories`.
const debugLogManager = DebugLogManager.getInstance();
debugLogManager.applyCategories(logCategories);
};

this.soleOpenedProject = function () {
Expand Down
2 changes: 1 addition & 1 deletion src/uiTest/scala/com/virtuslab/gitmachete/uitest/RunningIntelliJFixtureExtension.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ trait RunningIntelliJFixtureExtension extends RobotPluginExtension { this: IdePr

object ide {
def configure(): Unit = {
runJs("ide.configure(/* enableDebugLog */ false)", codebase = initialCodebase)
runJs("ide.configure()", codebase = initialCodebase)
}

def closeOpenedProjects(): Unit = {
Expand Down