From 189344db377195a31ce50fae9c128a6f19cbcaad Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Thu, 21 Jun 2018 11:28:51 -0700 Subject: [PATCH] Added issueManagement to pom. Removed application tasks (moved to samples). --- .idea/modules/samples-java_main.iml | 9 +++++---- .idea/modules/samples-java_test.iml | 9 +++++---- .idea/modules/samples-koltin_main.iml | 11 ++++++----- .idea/modules/samples-koltin_test.iml | 11 ++++++----- build.gradle.kts | 22 +++++++++++----------- pom.xml | 8 ++++++-- 6 files changed, 39 insertions(+), 31 deletions(-) diff --git a/.idea/modules/samples-java_main.iml b/.idea/modules/samples-java_main.iml index 6007e1c..f16e049 100644 --- a/.idea/modules/samples-java_main.iml +++ b/.idea/modules/samples-java_main.iml @@ -8,10 +8,11 @@ - - - + + + + - + \ No newline at end of file diff --git a/.idea/modules/samples-java_test.iml b/.idea/modules/samples-java_test.iml index 21f69d8..56ba4d8 100644 --- a/.idea/modules/samples-java_test.iml +++ b/.idea/modules/samples-java_test.iml @@ -7,11 +7,12 @@ - - - + + + + - + \ No newline at end of file diff --git a/.idea/modules/samples-koltin_main.iml b/.idea/modules/samples-koltin_main.iml index 80eeaa3..bdcf78b 100644 --- a/.idea/modules/samples-koltin_main.iml +++ b/.idea/modules/samples-koltin_main.iml @@ -12,7 +12,7 @@ @@ -31,10 +31,11 @@ - - - + + + + - + \ No newline at end of file diff --git a/.idea/modules/samples-koltin_test.iml b/.idea/modules/samples-koltin_test.iml index 75fecec..3886186 100644 --- a/.idea/modules/samples-koltin_test.iml +++ b/.idea/modules/samples-koltin_test.iml @@ -12,7 +12,7 @@ @@ -30,11 +30,12 @@ - - - + + + + - + \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 962891b..1a288a7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,7 +6,6 @@ import org.jetbrains.dokka.gradle.DokkaTask import java.net.URL plugins { - application kotlin("jvm") version "1.2.50" java `maven-publish` @@ -19,7 +18,8 @@ group = "net.thauvin.erik" version = "1.0.0" description = "Pinboard Poster for Kotlin/Java" -val mavenUrl = "https://github.com/ethauvin/$name" +val gitHub = "ethauvin/$name" +val mavenUrl = "https://github.com/$gitHub" val deployDir = "deploy" dependencies { @@ -32,11 +32,6 @@ repositories { jcenter() } -application { - mainClassName = "net.thauvin.erik.pinboard.PinboardPosterKt" -} - - tasks { withType(Test::class.java).all { useTestNG() @@ -130,10 +125,15 @@ tasks { } appendNode("scm").apply { - appendNode("connection", "$mavenUrl.git") - appendNode("developerConnection", "git@github.com:ethauvin/${project.name}.git") + appendNode("connection", "scm:git:$mavenUrl.git") + appendNode("developerConnection", "scm:git:git@github.com:${gitHub}.git") appendNode("url", mavenUrl) } + + appendNode("issueManagement").apply { + appendNode("system", "GitHub") + appendNode("url", "$mavenUrl/issues") + } } } } @@ -149,7 +149,7 @@ tasks { pom.copyTo(File("pom.xml"), true) } } - + fun findProperty(s: String) = project.findProperty(s) as String? bintray { user = findProperty("bintray.user") @@ -162,7 +162,7 @@ tasks { desc = description websiteUrl = mavenUrl issueTrackerUrl = "$mavenUrl/issues" - githubRepo = "ethauvin/${project.name}" + githubRepo = gitHub githubReleaseNotesFile = "README.md" vcsUrl = "$mavenUrl.git" setLabels("kotlin", "java", "pinboard", "poster", "bookmarks") diff --git a/pom.xml b/pom.xml index 2fdbc43..25b7bdb 100644 --- a/pom.xml +++ b/pom.xml @@ -35,8 +35,12 @@ - https://github.com/ethauvin/pinboard-poster.git - git@github.com:ethauvin/pinboard-poster.git + scm:git:https://github.com/ethauvin/pinboard-poster.git + scm:git:git@github.com:ethauvin/pinboard-poster.git https://github.com/ethauvin/pinboard-poster + + GitHub + https://github.com/ethauvin/pinboard-poster/issues +