Skip to content

Commit

Permalink
gradle stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
CDaut committed Jul 14, 2024
1 parent c47c7b4 commit 4a0e42f
Show file tree
Hide file tree
Showing 14 changed files with 27 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .direnv/flake-profile
1 change: 1 addition & 0 deletions .direnv/flake-profile-3-link
1 change: 0 additions & 1 deletion .direnv/flake-profile-8-link

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
}

intellij {
version = '2023.2.5'
version = '2024.1.4'
plugins = ['com.intellij.java']
}
patchPluginXml {
Expand Down
18 changes: 10 additions & 8 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
description = "A Nix-flake-based Java development environment";

inputs.nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.*.tar.gz";
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

outputs = { self, nixpkgs }:
let
Expand Down Expand Up @@ -36,4 +36,4 @@
};
});
};
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ public void actionPerformed(ActionEvent actionEvent) {
if (!AssessmentModeHandler.getInstance().isInAssesmentMode()) {
ArtemisUtils.displayGenericErrorBalloon(NO_ASSESSMENT_OPEN_ERR);
}
//TODO: implement
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import java.nio.file.Path;
import java.util.Comparator;
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.stream.Stream;
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
Expand Down Expand Up @@ -276,8 +279,8 @@ private void cloneSubmissionToTempdir(@NotNull String repoUrl, @NotNull String r
}

private void runAutograder() {
//TODO: boilerplate implementation
/*
//TODO: boilerplate implementation
try (TempLocation tempProjectLocation = TempLocation.random()) {
Application autograderInstance = new Application(tempProjectLocation);
Future<Integer> resultCode = Executors.newSingleThreadExecutor().submit(autograderInstance);
Expand All @@ -289,7 +292,7 @@ private void runAutograder() {
} catch (InterruptedException e) {
//If autograder is interrupted
}
*/
*/
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/kit/kastel/utils/AnnotationUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static void addAnnotationByMistakeType(IMistakeType mistakeType){
null,
new JBColor(annotationColor, annotationColor),
null,
EffectType.ROUNDED_BOX,
EffectType.BOLD_LINE_UNDERSCORE,
Font.PLAIN

);
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<idea-plugin>
<id>edu.kit.kastel.sdq.intelligrade</id>
<name>IntelliGrade</name>
<vendor email="[email protected]" url="https://github.com/kit-sdq/programming-lecture-eclipse-artemis">Clemens D.
<vendor email="[email protected]" url="https://github.com/kit-sdq/programming-lecture-eclipse-artemis">CDaut.
</vendor>

<description><![CDATA[
Expand Down

0 comments on commit 4a0e42f

Please sign in to comment.