Merge pull request #3 from caplin/dependency-updates

Build: Update Spring Boot, Gradle & DataSource. Replace Ktfmt plugin with Spotless.

Author: rossdanderson

.idea/AndroidProjectSystem.xml

@@ -1,8 +1,16 @@
 plugins {
   id("org.jetbrains.kotlinx.kover")
+  id("com.diffplug.spotless")
   base
 }
 
+spotless {
+  kotlinGradle {
+    ktfmt(libs.versions.ktfmt.get())
+    target("*.gradle.kts")
+  }
+}
+
 dependencies {
   kover(project(":reactive:datasourcex-reactive-api"))
   kover(project(":reactive:datasourcex-reactive-core"))
@@ -13,12 +21,4 @@ dependencies {
   kover(project(":datasourcex-util"))
 }
 
-kover {
-  reports {
-    filters {
-      excludes {
-        packages("samples")
-      }
-    }
-  }
-}
+kover { reports { filters { excludes { packages("samples") } } } }

.idea/DataSource-Extensions.iml

@@ -1,17 +1,25 @@
 plugins {
   `kotlin-dsl`
-  id("com.ncorti.ktfmt.gradle") version libs.versions.ktfmt.plugin
+  id("com.diffplug.spotless") version libs.versions.spotless.plugin
+}
+
+kotlin {
+  jvmToolchain(17)
 }
 
 dependencies {
   implementation(libs.kotlinpoet)
 
-  implementation(libs.ktfmt.plugin)
+  implementation(libs.spotless.plugin)
   implementation(libs.dokka.plugin)
-  implementation(libs.detekt.plugin)
   implementation(libs.binary.compatibility.validator.plugin)
   implementation(libs.kover.plugin)
   implementation(libs.kotlin.plugin)
   implementation(libs.kotlin.allopen.plugin)
   implementation(libs.vanniktech.maven.publish.plugin)
 }
+
+spotless {
+  kotlinGradle { ktfmt(libs.versions.ktfmt.get()) }
+  kotlin { ktfmt(libs.versions.ktfmt.get()) }
+}

.idea/kotlinc.xml

@@ -1,6 +1,6 @@
+
 import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.KotlinJvm
-import org.gradle.api.JavaVersion.VERSION_17
 import org.gradle.api.file.DuplicatesStrategy.WARN
 
 plugins {
@@ -10,14 +10,26 @@ plugins {
   idea
   id("org.jetbrains.kotlinx.kover")
   id("org.jetbrains.kotlinx.binary-compatibility-validator")
-  id("com.ncorti.ktfmt.gradle")
-  id("io.gitlab.arturbosch.detekt")
+  id("com.diffplug.spotless")
   id("org.jetbrains.dokka")
 }
 
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+val ktfmtVersion = libs.findVersion("ktfmt").get().requiredVersion
+
+spotless {
+  kotlin {
+    ktfmt(ktfmtVersion)
+    target("src/**/*.kt")
+  }
+  kotlinGradle {
+    ktfmt(ktfmtVersion)
+    target("*.gradle.kts")
+  }
+}
+
 java {
-  sourceCompatibility = VERSION_17
-  targetCompatibility = VERSION_17
+  toolchain { languageVersion.set(JavaLanguageVersion.of(17)) }
   withSourcesJar()
 }