From 858dc8f33ee25a480e9da8b22b64bef2f41d8f0a Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 17 Nov 2015 21:59:37 -0800
Subject: [PATCH] Fix Preconditions.

---
 src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt   | 5 ++---
 .../com/beust/kobalt/plugin/publish/PublishPlugin.kt     | 9 ++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt b/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
index ffb39ef2..542429a0 100644
--- a/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
+++ b/src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
@@ -4,7 +4,6 @@ import com.beust.kobalt.SystemProperties
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.misc.KFiles
 import com.beust.kobalt.misc.log
-import com.google.common.base.Preconditions
 import com.google.inject.assistedinject.Assisted
 import org.apache.maven.model.Developer
 import org.apache.maven.model.Model
@@ -21,8 +20,8 @@ public class PomGenerator @Inject constructor(@Assisted val project: Project) {
     }
 
     fun generate() {
-        Preconditions.checkNotNull(project.version, "version mandatory on project ${project.name}")
-        Preconditions.checkNotNull(project.artifactId, "artifactId mandatory on project ${project.name}")
+        requireNotNull(project.version, { "version mandatory on project ${project.name}"})
+        requireNotNull(project.artifactId, { "artifactId mandatory on project ${project.name}" })
         val m = Model().apply {
             name = project.name
             artifactId = project.artifactId
diff --git a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
index 08d860d0..3a9c1987 100644
--- a/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
+++ b/src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
@@ -9,7 +9,6 @@ import com.beust.kobalt.api.annotation.Task
 import com.beust.kobalt.internal.DocUrl
 import com.beust.kobalt.maven.PomGenerator
 import com.beust.kobalt.misc.*
-import com.google.common.base.Preconditions
 import java.io.File
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -38,10 +37,10 @@ public class PublishPlugin @Inject constructor(val files: KFiles, val factory: P
     }
 
     private fun validateProject(project: Project) {
-        Preconditions.checkNotNull(project.name, "Project $project should have a name")
-        Preconditions.checkNotNull(project.version, "Project $project should have a version")
-        Preconditions.checkNotNull(project.group, "Project $project should have a group")
-        Preconditions.checkNotNull(project.artifactId, "Project $project should have a artifactId")
+        requireNotNull(project.name, { "Project $project should have a name" })
+        requireNotNull(project.version, { "Project $project should have a version" })
+        requireNotNull(project.group, { "Project $project should have a group" })
+        requireNotNull(project.artifactId, { "Project $project should have a artifactId" })
     }
 
     private val VALID = arrayListOf(".jar", ".pom")