Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build.gradle.kts and libs.versions.toml. #24

Merged
merged 1 commit into from
Nov 20, 2023
Merged

Update build.gradle.kts and libs.versions.toml. #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.tasks.bundling.BootBuildImage
import java.net.URI
import kotlin.jvm.optionals.getOrNull

plugins {
base
Expand Down Expand Up @@ -61,32 +60,24 @@ dependencies {
}

java {
val javaVersion = getVersionFromCatalog("java")
val javaVersion = libs.versions.java.get()
sourceCompatibility = JavaVersion.toVersion(javaVersion)
}

kotlin {

jvmToolchain {
val javaVersion = getVersionFromCatalog("java")
val javaVersion = libs.versions.java.get()
languageVersion.set(JavaLanguageVersion.of(javaVersion))
}
}
fun getVersionFromCatalog(lookup: String): String {
val versionCatalog: VersionCatalog = extensions.getByType<VersionCatalogsExtension>().named("libs")
return versionCatalog
.findVersion(lookup)
.getOrNull()
?.requiredVersion
?: throw GradleException("Version '$lookup' is not specified in the version catalog")
}

tasks.withType<KotlinCompile>().configureEach {
kotlinOptions {
freeCompilerArgs += "-Xcontext-receivers"
freeCompilerArgs += "-Xjsr305=strict"
}
}

testing {
suites {
val test by getting(JvmTestSuite::class) {
Expand All @@ -98,6 +89,7 @@ testing {
springBoot {
buildInfo()
}

tasks.named<BootBuildImage>("bootBuildImage") {
imageName.set("$group/${project.name}")
publish.set(false)
Expand All @@ -116,7 +108,7 @@ tasks.named<BootBuildImage>("bootBuildImage") {
}

spotless {
val ktlintVersion = getVersionFromCatalog("ktlintVersion")
val ktlintVersion = libs.versions.ktlint.get()
kotlin {
ktlint(ktlintVersion)
licenseHeaderFile("FileHeader.txt")
Expand All @@ -125,7 +117,3 @@ spotless {
ktlint(ktlintVersion)
}
}

// tasks.withType<Test> {
// useJUnitPlatform()
// }
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ springDependencyManagement = "1.1.4"
spotless = "6.22.0"
java = "17"
kotlinxSerialization = "1.6.0"
ktlintVersion = "0.50.0"
ktlint = "0.50.0"
nimbusJoseJwt = "9.37.1"
nimbusOAuth2 = "11.6"
eudiSdJwt = "0.1.0-SNAPSHOT"
Expand Down