diff --git a/arrow-libs/core/arrow-atomic/build.gradle.kts b/arrow-libs/core/arrow-atomic/build.gradle.kts index c4b72e9baed..c9169d106be 100644 --- a/arrow-libs/core/arrow-atomic/build.gradle.kts +++ b/arrow-libs/core/arrow-atomic/build.gradle.kts @@ -18,16 +18,6 @@ spotless { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - kotlin { sourceSets { commonMain { @@ -36,20 +26,18 @@ kotlin { } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(projects.arrowFxCoroutines) - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - } + commonTest { + dependencies { + implementation(projects.arrowFxCoroutines) + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) } + } - jvmTest { - dependencies { - runtimeOnly(libs.kotest.runnerJUnit5) - } + jvmTest { + dependencies { + runtimeOnly(libs.kotest.runnerJUnit5) } } @@ -65,21 +53,21 @@ kotlin { } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(projects.arrowFxCoroutines) - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - } + commonTest { + dependencies { + implementation(projects.arrowFxCoroutines) + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) } - jvmTest { - dependencies { - runtimeOnly(libs.kotest.runnerJUnit5) - } + } + + jvmTest { + dependencies { + runtimeOnly(libs.kotest.runnerJUnit5) } } + } } diff --git a/arrow-libs/core/arrow-continuations/build.gradle.kts b/arrow-libs/core/arrow-continuations/build.gradle.kts index 43e0372889f..29aa405dd96 100644 --- a/arrow-libs/core/arrow-continuations/build.gradle.kts +++ b/arrow-libs/core/arrow-continuations/build.gradle.kts @@ -18,16 +18,6 @@ spotless { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} kotlin { sourceSets { @@ -36,19 +26,17 @@ kotlin { implementation(libs.kotlin.stdlibCommon) } } - if(!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(projects.arrowCore) - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - } + commonTest { + dependencies { + implementation(projects.arrowCore) + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) } - jvmTest { - dependencies { - runtimeOnly(libs.kotest.runnerJUnit5) - } + } + jvmTest { + dependencies { + runtimeOnly(libs.kotest.runnerJUnit5) } } jvmMain { diff --git a/arrow-libs/core/arrow-core-retrofit/build.gradle.kts b/arrow-libs/core/arrow-core-retrofit/build.gradle.kts index 28207014442..35be621dba7 100644 --- a/arrow-libs/core/arrow-core-retrofit/build.gradle.kts +++ b/arrow-libs/core/arrow-core-retrofit/build.gradle.kts @@ -17,32 +17,21 @@ spotless { apply(from = property("ANIMALSNIFFER")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - dependencies { compileOnly(libs.kotlin.stdlib) compileOnly(projects.arrowCore) compileOnly(libs.squareup.retrofit) - if (!enableCompatibilityMetadataVariant) { - testImplementation(projects.arrowCore) - testImplementation(libs.kotest.frameworkEngine) - testImplementation(libs.kotest.assertionsCore) - testImplementation(libs.kotest.property) - testCompileOnly(libs.kotlin.reflect) - testRuntimeOnly(libs.kotest.runnerJUnit5) - testImplementation(libs.squareup.okhttpMockWebServer) - testImplementation(libs.squareup.retrofitConverterGson) - testImplementation(libs.squareup.retrofitConverterMoshi) - testImplementation(libs.kotlinx.serializationJson) - testImplementation(libs.jakewharton.retrofitConverterKotlinxSerialization) - } + testImplementation(projects.arrowCore) + testImplementation(libs.kotest.frameworkEngine) + testImplementation(libs.kotest.assertionsCore) + testImplementation(libs.kotest.property) + testCompileOnly(libs.kotlin.reflect) + testRuntimeOnly(libs.kotest.runnerJUnit5) + testImplementation(libs.squareup.okhttpMockWebServer) + testImplementation(libs.squareup.retrofitConverterGson) + testImplementation(libs.squareup.retrofitConverterMoshi) + testImplementation(libs.kotlinx.serializationJson) + testImplementation(libs.jakewharton.retrofitConverterKotlinxSerialization) + } diff --git a/arrow-libs/core/arrow-core-serialization/build.gradle.kts b/arrow-libs/core/arrow-core-serialization/build.gradle.kts index d88648d6f82..ef44080ce2e 100644 --- a/arrow-libs/core/arrow-core-serialization/build.gradle.kts +++ b/arrow-libs/core/arrow-core-serialization/build.gradle.kts @@ -11,16 +11,6 @@ plugins { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - kotlin { sourceSets { commonMain { @@ -30,20 +20,19 @@ kotlin { api(libs.kotlinx.serializationCore) } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(libs.kotlinx.serializationJson) - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - } + + commonTest { + dependencies { + implementation(libs.kotlinx.serializationJson) + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) } + } - jvmTest { - dependencies { - runtimeOnly(libs.kotest.runnerJUnit5) - } + jvmTest { + dependencies { + runtimeOnly(libs.kotest.runnerJUnit5) } } } diff --git a/arrow-libs/core/arrow-core/build.gradle.kts b/arrow-libs/core/arrow-core/build.gradle.kts index 6b682d3386a..d2ffea656be 100644 --- a/arrow-libs/core/arrow-core/build.gradle.kts +++ b/arrow-libs/core/arrow-core/build.gradle.kts @@ -20,16 +20,6 @@ spotless { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - kotlin { sourceSets { commonMain { @@ -40,20 +30,19 @@ kotlin { api(libs.kotlin.stdlibCommon) } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(projects.arrowFxCoroutines) - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - } + + commonTest { + dependencies { + implementation(projects.arrowFxCoroutines) + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) } + } - jvmTest { - dependencies { - runtimeOnly(libs.kotest.runnerJUnit5) - } + jvmTest { + dependencies { + runtimeOnly(libs.kotest.runnerJUnit5) } } diff --git a/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts b/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts index 1363fb4aa48..519ba819ca8 100644 --- a/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts +++ b/arrow-libs/fx/arrow-fx-coroutines/build.gradle.kts @@ -17,16 +17,6 @@ spotless { apply(plugin = "io.kotest.multiplatform") -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - kotlin { sourceSets { commonMain { @@ -37,21 +27,20 @@ kotlin { } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - implementation(libs.coroutines.test) - } + commonTest { + dependencies { + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) + implementation(libs.coroutines.test) } - jvmTest { - dependencies { - runtimeOnly(libs.kotest.runnerJUnit5) - } + } + jvmTest { + dependencies { + runtimeOnly(libs.kotest.runnerJUnit5) } } + jvmMain { dependencies { implementation(libs.kotlin.stdlib) diff --git a/arrow-libs/fx/arrow-fx-stm/build.gradle.kts b/arrow-libs/fx/arrow-fx-stm/build.gradle.kts index 3706c23e278..e68d3676fc3 100644 --- a/arrow-libs/fx/arrow-fx-stm/build.gradle.kts +++ b/arrow-libs/fx/arrow-fx-stm/build.gradle.kts @@ -18,16 +18,6 @@ spotless { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - kotlin { sourceSets { commonMain { @@ -37,21 +27,21 @@ kotlin { implementation(libs.coroutines.core) } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(projects.arrowFxCoroutines) - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - } + + commonTest { + dependencies { + implementation(projects.arrowFxCoroutines) + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) } - jvmTest { - dependencies { - runtimeOnly(libs.kotest.runnerJUnit5) - } + } + jvmTest { + dependencies { + runtimeOnly(libs.kotest.runnerJUnit5) } } + jvmMain { dependencies { implementation(libs.kotlin.stdlib) diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts b/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts index 38009ad327a..709772bc586 100644 --- a/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts +++ b/arrow-libs/optics/arrow-optics-ksp-plugin/build.gradle.kts @@ -21,41 +21,29 @@ kotlin { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - dependencies { implementation(libs.ksp) - if (!enableCompatibilityMetadataVariant) { - testImplementation(libs.kotlin.stdlib) - testImplementation(libs.junitJupiter) - testImplementation(libs.junitJupiterEngine) - testImplementation(libs.assertj) - testImplementation(libs.classgraph) - testImplementation(libs.kotlinCompileTesting) { - exclude( - group = libs.classgraph.get().module.group, - module = libs.classgraph.get().module.name - ) - exclude( - group = libs.kotlin.stdlib.get().module.group, - module = libs.kotlin.stdlib.get().module.name - ) - } - testImplementation(libs.kotlinCompileTestingKsp) - testRuntimeOnly(projects.arrowOpticsKspPlugin) - testRuntimeOnly(projects.arrowAnnotations) - testRuntimeOnly(projects.arrowCore) - testRuntimeOnly(projects.arrowOptics) + testImplementation(libs.kotlin.stdlib) + testImplementation(libs.junitJupiter) + testImplementation(libs.junitJupiterEngine) + testImplementation(libs.assertj) + testImplementation(libs.classgraph) + testImplementation(libs.kotlinCompileTesting) { + exclude( + group = libs.classgraph.get().module.group, + module = libs.classgraph.get().module.name + ) + exclude( + group = libs.kotlin.stdlib.get().module.group, + module = libs.kotlin.stdlib.get().module.name + ) } + testImplementation(libs.kotlinCompileTestingKsp) + testRuntimeOnly(projects.arrowOpticsKspPlugin) + testRuntimeOnly(projects.arrowAnnotations) + testRuntimeOnly(projects.arrowCore) + testRuntimeOnly(projects.arrowOptics) } tasks { diff --git a/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts b/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts index e2d869cd62b..3c1d2b92920 100644 --- a/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts +++ b/arrow-libs/optics/arrow-optics-reflect/build.gradle.kts @@ -17,30 +17,18 @@ spotless { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - dependencies { api(projects.arrowCore) api(projects.arrowOptics) api(libs.kotlin.reflect) implementation(libs.kotlin.stdlib) - if(!enableCompatibilityMetadataVariant) { - testImplementation(libs.kotlin.stdlib) - testImplementation(libs.junitJupiterEngine) - testImplementation(libs.kotlin.reflect) + testImplementation(libs.kotlin.stdlib) + testImplementation(libs.junitJupiterEngine) + testImplementation(libs.kotlin.reflect) - testImplementation(libs.kotest.frameworkEngine) - testImplementation(libs.kotest.assertionsCore) - testImplementation(libs.kotest.property) - testRuntimeOnly(libs.kotest.runnerJUnit5) - } + testImplementation(libs.kotest.frameworkEngine) + testImplementation(libs.kotest.assertionsCore) + testImplementation(libs.kotest.property) + testRuntimeOnly(libs.kotest.runnerJUnit5) } diff --git a/arrow-libs/optics/arrow-optics/build.gradle.kts b/arrow-libs/optics/arrow-optics/build.gradle.kts index bfa33e53eec..3575b189959 100644 --- a/arrow-libs/optics/arrow-optics/build.gradle.kts +++ b/arrow-libs/optics/arrow-optics/build.gradle.kts @@ -18,16 +18,6 @@ spotless { apply(from = property("ANIMALSNIFFER_MPP")) -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - kotlin { sourceSets { commonMain { @@ -36,20 +26,19 @@ kotlin { api(libs.kotlin.stdlibCommon) } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(libs.kotest.frameworkEngine) - implementation(libs.kotest.assertionsCore) - implementation(libs.kotest.property) - } + + commonTest { + dependencies { + implementation(libs.kotest.frameworkEngine) + implementation(libs.kotest.assertionsCore) + implementation(libs.kotest.property) } - jvmTest { - dependencies { - implementation(libs.kotlin.stdlib) - implementation(libs.junitJupiterEngine) - implementation(libs.kotlin.reflect) - } + } + jvmTest { + dependencies { + implementation(libs.kotlin.stdlib) + implementation(libs.junitJupiterEngine) + implementation(libs.kotlin.reflect) } } diff --git a/arrow-libs/resilience/arrow-resilience/build.gradle.kts b/arrow-libs/resilience/arrow-resilience/build.gradle.kts index ed1b5ab3049..a460f9d203b 100644 --- a/arrow-libs/resilience/arrow-resilience/build.gradle.kts +++ b/arrow-libs/resilience/arrow-resilience/build.gradle.kts @@ -15,16 +15,6 @@ spotless { } } -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - -if (enableCompatibilityMetadataVariant) { - tasks.withType().configureEach { - exclude("**/*") - } -} - kotlin { sourceSets { commonMain { @@ -35,13 +25,11 @@ kotlin { implementation("org.jetbrains.kotlin:kotlin-stdlib") } } - if (!enableCompatibilityMetadataVariant) { - commonTest { - dependencies { - implementation(projects.arrowFxCoroutines) - implementation(libs.coroutines.test) - implementation(kotlin("test")) - } + commonTest { + dependencies { + implementation(projects.arrowFxCoroutines) + implementation(libs.coroutines.test) + implementation(kotlin("test")) } } } diff --git a/build.gradle.kts b/build.gradle.kts index db3e73a438a..778d4c491ff 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,9 @@ @file:Suppress("DSL_SCOPE_VIOLATION") import kotlinx.knit.KnitPluginExtension -import kotlinx.kover.gradle.plugin.dsl.KoverProjectExtension import org.jetbrains.dokka.gradle.DokkaMultiModuleTask import org.jetbrains.dokka.gradle.DokkaTaskPartial import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension -import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension -import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin buildscript { repositories { @@ -125,4 +122,3 @@ tasks { apiValidation { ignoredProjects.add("arrow-optics-ksp-plugin") } - diff --git a/settings.gradle.kts b/settings.gradle.kts index c1ca78fd2e7..961aab8b857 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -23,10 +23,6 @@ dependencyResolutionManagement { } } -val enableCompatibilityMetadataVariant = - providers.gradleProperty("kotlin.mpp.enableCompatibilityMetadataVariant") - .orNull?.toBoolean() == true - //CORE include("arrow-annotations") project(":arrow-annotations").projectDir = file("arrow-libs/core/arrow-annotations")