diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 8dbc6c5..f844b16 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -13,7 +13,7 @@ val gradleKotlinTarget = "1.6" dependencies { - implementation(enforcedPlatform("org.jetbrains.kotlin:kotlin-bom:${libs.versions.kotlin.get()}")) + implementation(platform(libs.kotlin.bom)) implementation("org.jetbrains.kotlin:kotlin-serialization") implementation("org.jetbrains.kotlin:kotlin-reflect") implementation("org.jetbrains.kotlin:kotlin-compiler-embeddable") @@ -29,7 +29,8 @@ dependencies { implementation("com.github.node-gradle:gradle-node-plugin:${libs.versions.gradleNodePlugin.get()}") - implementation("io.kotest:kotest-framework-multiplatform-plugin-gradle:${libs.versions.kotest.get()}") + implementation(platform(libs.kotest.bom)) + implementation("io.kotest:kotest-framework-multiplatform-plugin-gradle") implementation("io.kvision:io.kvision.gradle.plugin:${libs.versions.kvision.get()}") diff --git a/buildSrc/repositories.settings.gradle.kts b/buildSrc/repositories.settings.gradle.kts index 56eb40e..67f0f14 100644 --- a/buildSrc/repositories.settings.gradle.kts +++ b/buildSrc/repositories.settings.gradle.kts @@ -39,6 +39,8 @@ dependencyResolutionManagement { maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { content { includeGroup("org.jetbrains.kotlinx") } } + + sonatypeSnapshot() } pluginManagement { @@ -47,9 +49,9 @@ dependencyResolutionManagement { gradlePluginPortal() mavenCentral() jitpack() + sonatypeSnapshot() } } - } diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt index 961f730..7693f66 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/gradle/extensions.kt @@ -68,7 +68,7 @@ fun Project.execCapture(spec: ExecSpec.() -> Unit): String { fun Project.yarn(configure: YarnRootExtension.() -> Unit) = with(yarn, configure) -fun Directory.filesChecksum() = asFileTree +fun Directory.filesChecksum(): Long = asFileTree .files .map { it.readBytes() + it.absolutePath.toByteArray() } .fold(byteArrayOf()) { acc, bytes -> acc + bytes } diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts index eb96e83..dbb4b66 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/lang/kotlin-jvm.gradle.kts @@ -22,6 +22,7 @@ dependencies { testImplementation("io.mockk:mockk") } + tasks.withType().configureEach { kotlinOptions { @@ -40,16 +41,19 @@ tasks.withType().configureEach { ) } + tasks.compileTestKotlin { kotlinOptions.freeCompilerArgs += "-opt-in=io.kotest.common.ExperimentalKotest" } + kotlin { jvmToolchain { languageVersion.set(JavaLanguageVersion.of(projectJvmTarget)) } } + tasks.withType().configureEach { useJUnitPlatform() } diff --git a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/UpdatePackageJson.kt b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/UpdatePackageJson.kt index acae0c3..5674046 100644 --- a/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/UpdatePackageJson.kt +++ b/buildSrc/src/main/kotlin/dev/adamko/kafkatorio/task/UpdatePackageJson.kt @@ -29,10 +29,7 @@ abstract class UpdatePackageJson @Inject constructor( ) : DefaultTask(), ProviderFactory by providers { -// @get:Input -// abstract val propertiesToCheck: MapProperty - - /** Cumulative updates */ + /** Cumulative updates - will be combined one by one, then applied to [packageJsonFile] */ @get:Input internal abstract val expectedJsonUpdates: ListProperty @@ -45,8 +42,6 @@ abstract class UpdatePackageJson @Inject constructor( description = "Update package.json properties" outputs.upToDateWhen(JsonPropertiesUpToDateSpec) - -// expectedJson.convention("{}") } @@ -94,19 +89,6 @@ abstract class UpdatePackageJson @Inject constructor( } expectedJsonUpdates.add(expectedJsonUpdateProvider) - -// val newJson = -// expectedJson.zip(expectedJsonUpdateProvider) { currentJsonString, inputJsonString -> -// val currentJson = jsonMapper.encodeToJsonElement(currentJsonString).jsonObject -// -// val inputJson = jsonMapper.encodeToJsonElement(inputJsonString).jsonObject -// -// val newJson = JsonObject(currentJson + inputJson) -// -// jsonMapper.encodeToString(newJson) -// } -// -// expectedJson.set(newJson) }