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

eu-digital-identity-wallet · Nov 20, 2023 · cf6df15 · cf6df15
1 parent ea2c480
commit cf6df15
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -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
@@ -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) {
@@ -98,6 +89,7 @@ testing {
 springBoot {
     buildInfo()
 }
+
 tasks.named<BootBuildImage>("bootBuildImage") {
     imageName.set("$group/${project.name}")
     publish.set(false)
@@ -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")
@@ -125,7 +117,3 @@ spotless {
         ktlint(ktlintVersion)
     }
 }
-
-// tasks.withType<Test> {
-// 	useJUnitPlatform()
-// }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -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"