From 836dd5151ecef073ac631f6f7ef2507bc26ec49e Mon Sep 17 00:00:00 2001 From: Alyssa Date: Wed, 15 Nov 2023 08:23:12 +0000 Subject: [PATCH] tidy up gradle files --- buildSrc/build.gradle.kts | 5 ----- ...Entropy.kotlin-common-conventions.gradle.kts | 17 ----------------- ...ntropy.kotlin-library-conventions.gradle.kts | 11 ----------- client/build.gradle.kts | 4 ---- core/build.gradle.kts | 7 ++----- 5 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 buildSrc/src/main/kotlin/Entropy.kotlin-library-conventions.gradle.kts diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index bdff27f..2935039 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,9 +1,4 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { - // Support convention plugins written in Kotlin. Convention plugins are build scripts in 'src/main' that automatically become available as plugins in the main build. `kotlin-dsl` } diff --git a/buildSrc/src/main/kotlin/Entropy.kotlin-common-conventions.gradle.kts b/buildSrc/src/main/kotlin/Entropy.kotlin-common-conventions.gradle.kts index 513e47c..0e547a9 100644 --- a/buildSrc/src/main/kotlin/Entropy.kotlin-common-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/Entropy.kotlin-common-conventions.gradle.kts @@ -1,39 +1,22 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { - // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin. id("org.jetbrains.kotlin.jvm") } repositories { - // Use Maven Central for resolving dependencies. mavenCentral() } dependencies { constraints { - // Define dependency versions as constraints implementation("org.apache.commons:commons-text:1.9") - implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") } - // Align versions of all Kotlin components implementation(platform("org.jetbrains.kotlin:kotlin-bom")) - - // Use the Kotlin JDK 8 standard library. implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") - - // Align versions of all Kotlin components - implementation(platform("org.jetbrains.kotlin:kotlin-bom")) - - // Use JUnit Jupiter for testing. testImplementation("org.junit.jupiter:junit-jupiter:5.7.2") } tasks.named("test") { - // Use JUnit Platform for unit tests. useJUnitPlatform() } diff --git a/buildSrc/src/main/kotlin/Entropy.kotlin-library-conventions.gradle.kts b/buildSrc/src/main/kotlin/Entropy.kotlin-library-conventions.gradle.kts deleted file mode 100644 index 0cbde56..0000000 --- a/buildSrc/src/main/kotlin/Entropy.kotlin-library-conventions.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - // Apply the common convention plugin for shared build configuration between library and application projects. - id("Entropy.kotlin-common-conventions") - - // Apply the java-library plugin for API and implementation separation. - `java-library` -} diff --git a/client/build.gradle.kts b/client/build.gradle.kts index b057637..e1fb1a8 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -1,7 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { id("Entropy.kotlin-common-conventions") application diff --git a/core/build.gradle.kts b/core/build.gradle.kts index b095c20..128a7ab 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -1,9 +1,6 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - plugins { - id("Entropy.kotlin-library-conventions") + id("Entropy.kotlin-common-conventions") + `java-library` } dependencies {