Merge pull request #37 from kit-sdq/refactor

Major refactor, including update to Java 21, new IntelliJ Gradle Plugin, single-workspace model, and Artemis4j 2.0

.github/workflows/gradle.yml

@@ -18,10 +18,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
       - name: Build project with gradle
         uses: gradle/actions/setup-gradle@v4

.gitignore

@@ -180,4 +180,5 @@ gradle-app.setting
 # example project that is opened by the test IntelliJ instance
 exampleProject/
 
-grading-config-example.json
+grading-config-example.json
+.intellijPlatform/

build.gradle

@@ -1,33 +1,49 @@
 // See https://github.com/JetBrains/gradle-intellij-plugin/
 plugins {
-    id 'org.jetbrains.intellij' version '1.17.4'
+    id("org.jetbrains.intellij.platform") version "2.0.1"
     id 'java'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
 group 'edu.kit.kastel.sdq'
 version '1.0-SNAPSHOT'
 
+java {
+    sourceCompatibility = "21"
+    targetCompatibility = "21"
+}
+
 repositories {
-    mavenCentral()
     mavenLocal()
+    mavenCentral()
+    intellijPlatform {
+        defaultRepositories()
+    }
+    maven {
+        url 'https://s01.oss.sonatype.org/content/repositories/snapshots'
+    }
 }
 
 dependencies {
-    implementation 'edu.kit.kastel.sdq:artemis4j:6.7.5'
-    implementation 'org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r'
-    implementation 'org.apache.commons:commons-io:1.3.2'
-    implementation 'de.firemage.autograder:autograder-cmd:' + AUTOGRADER_VERION
-    implementation 'de.firemage.autograder:autograder-core:' + AUTOGRADER_VERION
-    implementation 'de.firemage.autograder:autograder-extra:' + AUTOGRADER_VERION
+    intellijPlatform {
+        intellijIdeaCommunity('2024.2.1')
+        pluginVerifier()
+        bundledPlugin("com.intellij.java")
+        bundledPlugin("org.jetbrains.idea.maven")
+        instrumentationTools()
+    }
+    implementation 'edu.kit.kastel.sdq:artemis4j:7.5.0-SNAPSHOT'
     // Tests
     testImplementation 'org.junit.jupiter:junit-jupiter-api:' + JUNIT_VERSION
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:' + JUNIT_VERSION
+    testImplementation 'com.tngtech.archunit:archunit:' + ARCHUNIT_VERSION
+    testImplementation 'com.tngtech.archunit:archunit-junit5:' + ARCHUNIT_VERSION
 }
 
-intellij {
-    version = '2024.1.4'
-    plugins = ['com.intellij.java']
+intellijPlatform {
+    pluginConfiguration {
+        name = "IntelliGrade"
+    }
 }
 patchPluginXml {
     changeNotes = """"""
@@ -38,7 +54,7 @@ test {
 
 tasks {
     runIde {
-        autoReloadPlugins = true
+        autoReload = true
     }
 
     buildSearchableOptions {

gradle.properties

@@ -1,2 +1,2 @@
-AUTOGRADER_VERION = 0.5.41
 JUNIT_VERSION = 5.11.1
+ARCHUNIT_VERSION = 1.3.0