Skip to content

Commit f21ba5f

Browse files
committed
Fix getting versions for javadoc
1 parent 782e298 commit f21ba5f

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.java-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1.8
1+
17
22

build.gradle.kts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
plugins {
22
java
3-
`jvm-test-suite`
43
jacoco
54
`jacoco-report-aggregation`
6-
id("org.sonarqube") version "4.0.0.2929"
5+
id("org.sonarqube") version "4.2.0.3129"
76
}
87

9-
val springVersion = "5.3.13"
10-
val springBootVersion = "2.4.13"
11-
128
val rootJacocoDir by extra("${rootProject.buildDir}/reports/jacoco/testCodeCoverageReport")
139
val reportXmlFile by extra("$rootJacocoDir/testCodeCoverageReport.xml")
1410

buildSrc/src/main/kotlin/com/mattbertolini/buildlogic/java-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tasks.named<JavaCompile>("compileJava").configure {
2020
testing {
2121
suites {
2222
named<JvmTestSuite>("test").configure {
23-
useJUnitJupiter(versionCatalog.findVersion("junit").orElseThrow().preferredVersion)
23+
useJUnitJupiter(versionCatalog.findVersion("junit").orElseThrow().toString())
2424
}
2525
}
2626
}
@@ -34,8 +34,8 @@ tasks.named<Jar>("jar").configure {
3434
}
3535
}
3636

37-
val springVersion: String = versionCatalog.findVersion("spring").orElseThrow().preferredVersion
38-
val springBootVersion: String = versionCatalog.findVersion("springBoot").orElseThrow().preferredVersion
37+
val springVersion: String = versionCatalog.findVersion("spring").orElseThrow().toString()
38+
val springBootVersion: String = versionCatalog.findVersion("springBoot").orElseThrow().toString()
3939

4040
val javadocLinks = arrayOf(
4141
"https://docs.oracle.com/javase/8/docs/api/",

0 commit comments

Comments
 (0)