Ignore stderr stream.

ethauvin · May 27, 2019 · a96c113 · a96c113
1 parent 462c081
commit a96c113
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 22 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,21 +5,21 @@ import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
-    `build-scan`
+    id("com.gradle.build-scan") version "2.3"
     jacoco
     java
-    kotlin("jvm") version "1.3.30"
+    kotlin("jvm") version "1.3.31"
     `maven-publish`
     id("com.github.ben-manes.versions") version "0.21.0"
     id("com.jfrog.bintray") version "1.8.4"
     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"
+    id("org.jmailen.kotlinter") version "1.25.2"
+    id("org.sonarqube") version "2.7.1"
 }
 
 group = "net.thauvin.erik"
-version = "1.0.1-beta"
+version = "1.0.1"
 description = "Pinboard Poster for Kotlin/Java"
 
 val gitHub = "ethauvin/$name"
@@ -48,18 +48,24 @@ repositories {
 }
 
 dependencies {
-    compile("com.squareup.okhttp3:okhttp:3.14.0")
+    compile("com.squareup.okhttp3:okhttp:3.14.2")
     compile(kotlin("stdlib"))
 
     testImplementation("org.testng:testng:6.14.3")
 }
 
 detekt {
-    input = files("src/main/kotlin")
+    input = files("src/main/kotlin", "src/test/kotlin")
     filters = ".*/resources/.*,.*/build/.*"
     baseline = project.rootDir.resolve("detekt-baseline.xml")
 }
 
+kotlinter {
+    ignoreFailures = false
+    reporters = arrayOf("html")
+    experimentalRules = false
+}
+
 jacoco {
     toolVersion = "0.8.3"
 }
@@ -104,6 +110,16 @@ tasks {
         destination = file("$projectDir/pom.xml")
     }
 
+    assemble {
+        dependsOn(sourcesJar, javadocJar)
+    }
+
+    clean {
+        doLast {
+            project.delete(fileTree(deployDir))
+        }
+    }
+
     dokka {
         outputFormat = "html"
         outputDirectory = "$buildDir/javadoc"
@@ -117,10 +133,6 @@ tasks {
         includeNonPublic = false
     }
 
-    assemble {
-        dependsOn(sourcesJar, javadocJar)
-    }
-
     val copyToDeploy by registering(Copy::class) {
         from(configurations.runtime) {
             exclude("annotations-*.jar")
@@ -132,7 +144,7 @@ tasks {
     register("deploy") {
         description = "Copies all needed files to the $deployDir directory."
         group = PublishingPlugin.PUBLISH_TASK_GROUP
-        dependsOn("build")
+        dependsOn("build", "jar")
         outputs.dir(deployDir)
         inputs.files(copyToDeploy)
         mustRunAfter("clean")
@@ -153,10 +165,6 @@ tasks {
         }
     }
 
-    check {
-        dependsOn("ktlintCheck")
-    }
-
     val bintrayUpload by existing(BintrayUploadTask::class) {
         dependsOn(publishToMavenLocal, gitTag)
     }

diff --git a/pom.xml b/pom.xml
@@ -3,18 +3,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.thauvin.erik</groupId>
   <artifactId>pinboard-poster</artifactId>
-  <version>1.0.1-beta</version>
+  <version>1.0.1</version>
   <dependencies>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>3.14.0</version>
+      <version>3.14.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
       <artifactId>kotlin-stdlib</artifactId>
-      <version>1.3.30</version>
+      <version>1.3.31</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

diff --git a/samples/java/build.gradle b/samples/java/build.gradle
@@ -8,7 +8,7 @@ defaultTasks 'run'
 mainClassName = 'net.thauvin.erik.pinboard.samples.JavaExample'
 
 dependencies {
-    compile 'net.thauvin.erik:pinboard-poster:1.0.0'
+    compile 'net.thauvin.erik:pinboard-poster:1.0.1'
 }
 
 repositories {

diff --git a/samples/kotlin/build.gradle.kts b/samples/kotlin/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 defaultTasks(ApplicationPlugin.TASK_RUN_NAME)
 
 dependencies {
-    compile("net.thauvin.erik:pinboard-poster:1.0.0")
+    compile("net.thauvin.erik:pinboard-poster:1.0.1")
 }
 
 application {

diff --git a/samples/kotlin/kobalt/src/Build.kt b/samples/kotlin/kobalt/src/Build.kt
@@ -13,7 +13,7 @@ val p = project {
     version = "0.1"
 
     dependencies {
-        compile("net.thauvin.erik:pinboard-poster:1.0.0")
+        compile("net.thauvin.erik:pinboard-poster:1.0.1")
     }
 
     assemble {
@@ -23,6 +23,7 @@ val p = project {
     }
 
     application {
+        ignoreErrorStream = true
         mainClass = "net.thauvin.erik.pinboard.samples.KotlinExampleKt"
     }
 }