Merge to master (#20)

* Update README.md * Improve GHA and usual repository boilerplate (#12) Refactoring GHA for code quality * Repository cleanup (#19) * Delete unnecessary files * Setup multi modular gradle project properly * Rename GUILD.md to README.md * Run Spotless on all files * Update Spring plugin to latest for Java 21 support * Create pre-commit.yaml GHA * Use .yaml for Spring properties * Packaged JShellWrapper * Add docker-compose.yaml * Update README.md --------- Co-authored-by: Alathreon <[email protected]> Co-authored-by: Suraj Kumar <[email protected]> Co-authored-by: Suraj Kumar <[email protected]>
Together-Java · May 24, 2024 · f11ac08 · f11ac08
1 parent 584f0f9
commit f11ac08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/JShellAPI/build.gradle b/JShellAPI/build.gradle
@@ -36,4 +36,4 @@ shadowJar {
     archiveBaseName.set('JShellPlaygroundBackend')
     archiveClassifier.set('')
     archiveVersion.set('')
-}
+}
diff --git a/JShellWrapper/build.gradle b/JShellWrapper/build.gradle
@@ -41,4 +41,4 @@ shadowJar {
     archiveBaseName.set('JShellWrapper')
     archiveClassifier.set('')
     archiveVersion.set('')
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -64,7 +64,12 @@ subprojects {
     }
 
     dependencies {
+<<<<<<< HEAD
         testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
         testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+=======
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+        testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
+>>>>>>> 1a41fc8 (Merge to master (#20))
     }
 }