diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index dd092af..e3584e7 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -6,6 +6,6 @@ \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 193d138..c6082b6 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,13 +3,15 @@ + + + - \ No newline at end of file diff --git a/.idea/modules/samples-kotlin~1.iml b/.idea/modules/pinboard-poster-samples-kotlin.iml similarity index 100% rename from .idea/modules/samples-kotlin~1.iml rename to .idea/modules/pinboard-poster-samples-kotlin.iml diff --git a/.idea/modules/pinboard-poster_main.iml b/.idea/modules/pinboard-poster_main.iml new file mode 100644 index 0000000..a0c6ab6 --- /dev/null +++ b/.idea/modules/pinboard-poster_main.iml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/pinboard-poster_test.iml b/.idea/modules/pinboard-poster_test.iml new file mode 100644 index 0000000..3b805bb --- /dev/null +++ b/.idea/modules/pinboard-poster_test.iml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/samples-java_main.iml b/.idea/modules/samples-java_main.iml index 8542d68..f16e049 100644 --- a/.idea/modules/samples-java_main.iml +++ b/.idea/modules/samples-java_main.iml @@ -9,7 +9,10 @@ - + + + + \ No newline at end of file diff --git a/.idea/modules/samples-java_test.iml b/.idea/modules/samples-java_test.iml index 6c82d1c..56ba4d8 100644 --- a/.idea/modules/samples-java_test.iml +++ b/.idea/modules/samples-java_test.iml @@ -6,9 +6,13 @@ + - + + + + \ No newline at end of file diff --git a/.idea/modules/samples-kotlin_main.iml b/.idea/modules/samples-kotlin_main.iml index ce31ed3..75362b9 100644 --- a/.idea/modules/samples-kotlin_main.iml +++ b/.idea/modules/samples-kotlin_main.iml @@ -6,12 +6,13 @@ diff --git a/.idea/modules/samples-kotlin_test.iml b/.idea/modules/samples-kotlin_test.iml index 6308f4c..247421e 100644 --- a/.idea/modules/samples-kotlin_test.iml +++ b/.idea/modules/samples-kotlin_test.iml @@ -6,12 +6,19 @@ + diff --git a/build.gradle.kts b/build.gradle.kts index 85d53c7..8fc0c52 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,15 +5,17 @@ import java.io.FileInputStream import java.util.Properties plugins { - kotlin("jvm") version "1.3.21" `build-scan` + jacoco java + kotlin("jvm") version "1.3.21" `maven-publish` id("com.github.ben-manes.versions") version "0.21.0" id("com.jfrog.bintray") version "1.8.4" - id("org.jetbrains.dokka") version "0.9.17" - id("org.jlleitschuh.gradle.ktlint") version "7.2.1" id("io.gitlab.arturbosch.detekt") version "1.0.0-RC14" + id("org.jetbrains.dokka") version "0.9.18" + id("org.jlleitschuh.gradle.ktlint") version "7.2.1" + id("org.sonarqube") version "2.7" } group = "net.thauvin.erik" @@ -46,9 +48,9 @@ repositories { } dependencies { - compile(kotlin("stdlib")) - compile("com.squareup.okhttp3:okhttp:3.14.0") - testCompile("org.testng:testng:6.14.3") + implementation(kotlin("stdlib")) + implementation("com.squareup.okhttp3:okhttp:3.14.0") + testImplementation("org.testng:testng:6.14.3") } detekt { @@ -57,6 +59,13 @@ detekt { baseline = project.rootDir.resolve("detekt-baseline.xml") } +sonarqube { + properties { + property("sonar.projectKey", "ethauvin_pinboard-poster") + property("sonar.sourceEncoding", "UTF-8") + } +} + val sourcesJar by tasks.creating(Jar::class) { archiveClassifier.set("sources") from(sourceSets.getByName("main").allSource) @@ -75,6 +84,12 @@ tasks { useTestNG() } + withType { + reports { + html.isEnabled = true + } + } + withType { kotlinOptions.jvmTarget = "1.8" } @@ -88,7 +103,7 @@ tasks { outputDirectory = "$buildDir/javadoc" jdkVersion = 8 val mapping = LinkMapping().apply { - dir = project.rootDir.toPath().resolve("src/main/kotlin").toFile().path + dir = "src/main/kotlin" url = "https://github.com/ethauvin/pinboard-poster/blob/${project.version}/src/main/kotlin" suffix = "#L" } diff --git a/pinboard-poster.iml b/pinboard-poster.iml index 855f5ec..67d3a83 100644 --- a/pinboard-poster.iml +++ b/pinboard-poster.iml @@ -1,5 +1,5 @@ - + @@ -17,13 +17,9 @@ - - - + - - @@ -31,11 +27,5 @@ - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 25b7bdb..e9deace 100644 --- a/pom.xml +++ b/pom.xml @@ -3,19 +3,19 @@ 4.0.0 net.thauvin.erik pinboard-poster - 1.0.0 + 1.0.1-beta org.jetbrains.kotlin kotlin-stdlib - 1.2.50 - compile + 1.3.21 + runtime com.squareup.okhttp3 okhttp - 3.10.0 - compile + 3.14.0 + runtime pinboard-poster