Skip to content

Commit

Permalink
Merge pull request #1413 from UMM-CSci-3601/1411-upgrade-to-java-v21-lts
Browse files Browse the repository at this point in the history
1411 upgrade to java v21 lts
  • Loading branch information
kklamberty authored Jan 12, 2024
2 parents a896ab8 + 8a8c7ef commit 4c30727
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
9 changes: 6 additions & 3 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ plugins {
id 'checkstyle'
}

// Build and run the project with Java 11
// Build and run the project with Java 21
java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(21)
}
}

Expand Down Expand Up @@ -46,6 +46,9 @@ dependencies {
// JUnit Jupiter Engine for testing.
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.1'

// JUnit Platform Launcher for testing.
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

// Mockito for testing
testImplementation 'org.mockito:mockito-core:5.8.0'

Expand Down Expand Up @@ -75,7 +78,7 @@ jacocoTestReport {
// This isn't strictly necessary, but the default reports
// location is buried pretty deep in the build directory,
// so this makes it easier to find.
html.destination file("${buildDir}/jacocoHtml")
html.outputLocation = file("${buildDir}/jacocoHtml")
}

afterEvaluate {
Expand Down
7 changes: 7 additions & 0 deletions server/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@
* Detailed information about configuring a multi-project build in Gradle can be found
* in the user manual at https://docs.gradle.org/5.6/userguide/multi_project_builds.html
*/
// This allows us to use the jresolver plugin. If we have
// this plugin in place, we can specify a particular JDK version
// in `build.gradle` and Gradle will download it for us if it's
// not already installed on the system. This will hopefully make
// it easier for people to run the project on a broad range of
// computers without having to worry about installing the right
// JDK version.

plugins {
id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
Expand Down

0 comments on commit 4c30727

Please sign in to comment.