Skip to content

Commit f11ac08

Browse files
tj-wazeiAlathreonsurajkumar
authored andcommittedMay 24, 2024
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]>
1 parent 584f0f9 commit f11ac08

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed
 

‎JShellAPI/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ shadowJar {
3636
archiveBaseName.set('JShellPlaygroundBackend')
3737
archiveClassifier.set('')
3838
archiveVersion.set('')
39-
}
39+
}

‎JShellWrapper/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ shadowJar {
4141
archiveBaseName.set('JShellWrapper')
4242
archiveClassifier.set('')
4343
archiveVersion.set('')
44-
}
44+
}

‎build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,12 @@ subprojects {
6464
}
6565

6666
dependencies {
67+
<<<<<<< HEAD
6768
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
6869
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
70+
=======
71+
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
72+
testImplementation 'org.junit.jupiter:junit-jupiter:5.8.1'
73+
>>>>>>> 1a41fc8 (Merge to master (#20))
6974
}
7075
}

0 commit comments

Comments
 (0)
Please sign in to comment.