From 106676742d54df4b04dc5f37131d3c09c9b9708c Mon Sep 17 00:00:00 2001 From: Marco Perazzo Date: Sun, 24 Mar 2024 10:40:05 +0100 Subject: [PATCH] Get rid of buildSrc --- build.gradle.kts | 39 ++++++++++++------------ buildSrc/build.gradle.kts | 7 ----- buildSrc/src/main/kotlin/Dependencies.kt | 39 ------------------------ 3 files changed, 20 insertions(+), 65 deletions(-) delete mode 100644 buildSrc/build.gradle.kts delete mode 100644 buildSrc/src/main/kotlin/Dependencies.kt diff --git a/build.gradle.kts b/build.gradle.kts index f3365c7..65dcd59 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,14 +10,14 @@ val gitUrl = "https://github.com/mpe85/${project.name}" val gitScmUrl = "https://github.com/mpe85/${project.name}.git" plugins { - id(Plugins.DETEKT) version Versions.DETEKT - id(Plugins.DOKKA) version Versions.DOKKA - kotlin(Plugins.KOTLIN_JVM) version Versions.KOTLIN - id(Plugins.KOVER) version Versions.KOVER - id(Plugins.KTLINT) version Versions.KTLINT_PLUGIN - id(Plugins.MAVEN_PUBLISH) - id(Plugins.SIGNING) - id(Plugins.VERSIONS) version Versions.VERSIONS + id("io.gitlab.arturbosch.detekt") version "1.23.5" + id("org.jetbrains.dokka") version "1.9.20" + kotlin("jvm") version "1.9.23" + id("org.jetbrains.kotlinx.kover") version "0.7.6" + id("org.jlleitschuh.gradle.ktlint") version "12.1.0" + id("org.gradle.maven-publish") + id("org.gradle.signing") + id("com.github.ben-manes.versions") version "0.51.0" } repositories { @@ -25,16 +25,16 @@ repositories { } dependencies { - implementation(Libs.BYTE_BUDDY) - implementation(Libs.EVENT_BUS) - implementation(Libs.ICU4J) - implementation(Libs.KOTLIN_REFLECT) - implementation(Libs.KOTLIN_STDLIB) - testImplementation(Libs.JUNIT_JUPITER) - testImplementation(Libs.KOTEST_ASSERTIONS_CORE) - testImplementation(Libs.KOTEST_PROPERTY) - testImplementation(Libs.KOTEST_RUNNER_JUNIT5) - testImplementation(Libs.MOCKK) + implementation("net.bytebuddy:byte-buddy:1.14.12") + implementation("org.greenrobot:eventbus-java:3.3.1") + implementation("com.ibm.icu:icu4j:74.2") + implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.23") + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.23") + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") + testImplementation("io.kotest:kotest-assertions-core:5.8.1") + testImplementation("io.kotest:kotest-property:5.8.1") + testImplementation("io.kotest:kotest-runner-junit5:5.8.1") + testImplementation("io.mockk:mockk:1.13.10") } kotlin { @@ -42,7 +42,7 @@ kotlin { } ktlint { - version.set(Versions.KTLINT) + version.set("1.2.1") } koverReport { @@ -100,6 +100,7 @@ tasks { } dependencyUpdates { revision = "release" + checkConstraints = false gradleReleaseChannel = CURRENT.id rejectVersionIf { candidate.version.isNonStable() diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index d317042..0000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,7 +0,0 @@ -repositories { - mavenCentral() -} - -plugins { - `kotlin-dsl` -} diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt deleted file mode 100644 index 5773cc0..0000000 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ /dev/null @@ -1,39 +0,0 @@ -object Versions { - const val BYTE_BUDDY = "1.14.12" - const val DETEKT = "1.23.5" - const val DOKKA = "1.9.20" - const val EVENT_BUS = "3.3.1" - const val ICU4J = "74.2" - const val JUNIT = "5.10.2" - const val KOTEST = "5.8.1" - const val KOTLIN = "1.9.23" - const val KOVER = "0.7.6" - const val KTLINT = "1.2.1" - const val KTLINT_PLUGIN = "12.1.0" - const val MOCKK = "1.13.10" - const val VERSIONS = "0.51.0" -} - -object Plugins { - const val DETEKT = "io.gitlab.arturbosch.detekt" - const val DOKKA = "org.jetbrains.dokka" - const val KOTLIN_JVM = "jvm" - const val KOVER = "org.jetbrains.kotlinx.kover" - const val KTLINT = "org.jlleitschuh.gradle.ktlint" - const val MAVEN_PUBLISH = "org.gradle.maven-publish" - const val SIGNING = "org.gradle.signing" - const val VERSIONS = "com.github.ben-manes.versions" -} - -object Libs { - const val BYTE_BUDDY = "net.bytebuddy:byte-buddy:${Versions.BYTE_BUDDY}" - const val EVENT_BUS = "org.greenrobot:eventbus-java:${Versions.EVENT_BUS}" - const val ICU4J = "com.ibm.icu:icu4j:${Versions.ICU4J}" - const val JUNIT_JUPITER = "org.junit.jupiter:junit-jupiter:${Versions.JUNIT}" - const val KOTEST_ASSERTIONS_CORE = "io.kotest:kotest-assertions-core:${Versions.KOTEST}" - const val KOTEST_PROPERTY = "io.kotest:kotest-property:${Versions.KOTEST}" - const val KOTEST_RUNNER_JUNIT5 = "io.kotest:kotest-runner-junit5:${Versions.KOTEST}" - const val KOTLIN_REFLECT = "org.jetbrains.kotlin:kotlin-reflect:${Versions.KOTLIN}" - const val KOTLIN_STDLIB = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${Versions.KOTLIN}" - const val MOCKK = "io.mockk:mockk:${Versions.MOCKK}" -}