From 0fa364b47e02a6716edc16bda6e3bedd41d34ec5 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Sep 2023 14:01:48 -0700 Subject: [PATCH 1/2] Hard-coded description --- .github/workflows/publish.yml | 3 --- .../src/main/kotlin/buildsrc/conventions/publishing.gradle.kts | 2 +- urlencoder-app/build.gradle.kts | 2 -- urlencoder-lib/build.gradle.kts | 2 -- 4 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 59c8635..e89e240 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -35,9 +35,6 @@ jobs: - name: Publish JS release run: ./gradlew publishJsPublicationToOSSRHRepository - - name: Delete GnuPG data - run: rm -rfv $HOME/.gnupg - publish-linux: runs-on: ubuntu-latest steps: diff --git a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts index 5952514..660d4b1 100644 --- a/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts +++ b/buildSrc/src/main/kotlin/buildsrc/conventions/publishing.gradle.kts @@ -31,7 +31,7 @@ publishing { withType().configureEach { pom { name.set("UrlEncoder for Kotlin Multiplatform") - description.set(project.description) + description.set("A simple defensive library to encode/decode URL components") url.set(mavenUrl) licenses { license { diff --git a/urlencoder-app/build.gradle.kts b/urlencoder-app/build.gradle.kts index c5fe1df..82e9f4c 100644 --- a/urlencoder-app/build.gradle.kts +++ b/urlencoder-app/build.gradle.kts @@ -9,8 +9,6 @@ plugins { id("com.github.ben-manes.versions") } -description = "A simple defensive application to encode/decode URL components" - val deployDir = project.layout.projectDirectory.dir("deploy") val urlEncoderMainClass = "net.thauvin.erik.urlencoder.UrlEncoder" diff --git a/urlencoder-lib/build.gradle.kts b/urlencoder-lib/build.gradle.kts index f922e29..ca6d91c 100644 --- a/urlencoder-lib/build.gradle.kts +++ b/urlencoder-lib/build.gradle.kts @@ -8,8 +8,6 @@ plugins { id("com.github.ben-manes.versions") } -description = "A simple defensive library to encode/decode URL components" - val deployDir = project.layout.projectDirectory.dir("deploy") kotlin { From efcfe5e56f361adeddd207937fb48a52b2ae824d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Sep 2023 14:06:08 -0700 Subject: [PATCH 2/2] Removed deploy tasks --- urlencoder-app/build.gradle.kts | 20 -------------------- urlencoder-lib/build.gradle.kts | 22 ---------------------- 2 files changed, 42 deletions(-) diff --git a/urlencoder-app/build.gradle.kts b/urlencoder-app/build.gradle.kts index 82e9f4c..93a9789 100644 --- a/urlencoder-app/build.gradle.kts +++ b/urlencoder-app/build.gradle.kts @@ -9,7 +9,6 @@ plugins { id("com.github.ben-manes.versions") } -val deployDir = project.layout.projectDirectory.dir("deploy") val urlEncoderMainClass = "net.thauvin.erik.urlencoder.UrlEncoder" kotlin { @@ -61,28 +60,9 @@ tasks { dependsOn(fatJar) } - clean { - delete(deployDir) - } - withType().configureEach { dokkaSourceSets.configureEach { moduleName.set("UrlEncoder Application") } } - - val copyToDeploy by registering(Sync::class) { - group = PublishingPlugin.PUBLISH_TASK_GROUP - from(configurations.jvmRuntimeClasspath) { - exclude("annotations-*.jar") - } - from(jvmJar) - into(deployDir) - } - - register("deploy") { - description = "Copies all needed files to the 'deploy' directory." - group = PublishingPlugin.PUBLISH_TASK_GROUP - dependsOn(build, copyToDeploy) - } } diff --git a/urlencoder-lib/build.gradle.kts b/urlencoder-lib/build.gradle.kts index ca6d91c..a05acf5 100644 --- a/urlencoder-lib/build.gradle.kts +++ b/urlencoder-lib/build.gradle.kts @@ -8,8 +8,6 @@ plugins { id("com.github.ben-manes.versions") } -val deployDir = project.layout.projectDirectory.dir("deploy") - kotlin { sourceSets { commonTest { @@ -26,11 +24,6 @@ base { } tasks { - - clean { - delete(deployDir) - } - dokkaJavadoc { dokkaSourceSets { configureEach { @@ -50,19 +43,4 @@ tasks { moduleName.set("UrlEncoder Library") } } - - val copyToDeploy by registering(Sync::class) { - group = PublishingPlugin.PUBLISH_TASK_GROUP - from(configurations.runtimeClasspath) { - exclude("annotations-*.jar") - } - from(jvmJar) - into(deployDir) - } - - register("deploy") { - description = "Copies all needed files to the 'deploy' directory." - group = PublishingPlugin.PUBLISH_TASK_GROUP - dependsOn(build, copyToDeploy) - } }