From 560790c2c636708801b0e4d8d465be2b9295c4c4 Mon Sep 17 00:00:00 2001 From: Andrew Lord Date: Mon, 15 Mar 2021 09:16:40 +0000 Subject: [PATCH] Remove dependency constraints --- meta/dependencies/build.gradle.kts | 39 ------------------------------ settings.gradle.kts | 1 - turtle/build.gradle.kts | 12 ++++----- 3 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 meta/dependencies/build.gradle.kts diff --git a/meta/dependencies/build.gradle.kts b/meta/dependencies/build.gradle.kts deleted file mode 100644 index 848a155..0000000 --- a/meta/dependencies/build.gradle.kts +++ /dev/null @@ -1,39 +0,0 @@ -plugins { - id("java-platform") - id("maven-publish") -} - -javaPlatform { - allowDependencies() -} - -dependencies { - api(enforcedPlatform("org.jetbrains.kotlin:kotlin-bom:1.4.31")) - - constraints { - junit5() - mockk() - truth() - } -} - -fun DependencyConstraintHandler.junit5() { - api("org.junit.jupiter:junit-jupiter-api:5.7.1") - api("org.junit.jupiter:junit-jupiter-engine:5.7.1") -} - -fun DependencyConstraintHandler.mockk() { - api("io.mockk:mockk:1.10.6") -} - -fun DependencyConstraintHandler.truth() { - api("com.google.truth:truth:1.1.2") -} - -publishing { - publications { - create("turtlePlatform") { - from(components["javaPlatform"]) - } - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 4636f9b..71d019e 100755 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,6 @@ rootProject.name = "turtle" include( - ":meta:dependencies", "turtle", "sample" ) diff --git a/turtle/build.gradle.kts b/turtle/build.gradle.kts index d1f0592..1321f70 100755 --- a/turtle/build.gradle.kts +++ b/turtle/build.gradle.kts @@ -13,14 +13,12 @@ apply(plugin = "org.jlleitschuh.gradle.ktlint") apply(plugin = "org.jlleitschuh.gradle.ktlint-idea") dependencies { - implementation(enforcedPlatform(project(":meta:dependencies"))) + implementation("org.jetbrains.kotlin:kotlin-stdlib:1.4.31") - implementation("org.jetbrains.kotlin:kotlin-stdlib") - - testImplementation("com.google.truth:truth") - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - testImplementation("io.mockk:mockk") + testImplementation("com.google.truth:truth:1.1.2") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.1") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.1") + testImplementation("io.mockk:mockk:1.10.6") } tasks.dokkaHtml.configure {