erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

Fix Preconditions.

Browse source
This commit is contained in:
Cedric Beust 2015-11-17 21:59:37 -08:00
parent 1bb722e285
commit 858dc8f33e
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/com/beust/kobalt/maven/PomGenerator.kt
View file

@ -4,7 +4,6 @@ import com.beust.kobalt.SystemProperties
import com.beust.kobalt.api.Project import com.beust.kobalt.api.Project
import com.beust.kobalt.misc.KFiles import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.google.common.base.Preconditions
import com.google.inject.assistedinject.Assisted import com.google.inject.assistedinject.Assisted
import org.apache.maven.model.Developer import org.apache.maven.model.Developer
import org.apache.maven.model.Model import org.apache.maven.model.Model
@ -21,8 +20,8 @@ public class PomGenerator @Inject constructor(@Assisted val project: Project) {
} }
fun generate() { fun generate() {
Preconditions.checkNotNull(project.version, "version mandatory on project ${project.name}") requireNotNull(project.version, { "version mandatory on project ${project.name}"})
Preconditions.checkNotNull(project.artifactId, "artifactId mandatory on project ${project.name}") requireNotNull(project.artifactId, { "artifactId mandatory on project ${project.name}" })
val m = Model().apply { val m = Model().apply {
name = project.name name = project.name
artifactId = project.artifactId artifactId = project.artifactId

9
src/main/kotlin/com/beust/kobalt/plugin/publish/PublishPlugin.kt
View file

@ -9,7 +9,6 @@ import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.internal.DocUrl import com.beust.kobalt.internal.DocUrl
import com.beust.kobalt.maven.PomGenerator import com.beust.kobalt.maven.PomGenerator
import com.beust.kobalt.misc.* import com.beust.kobalt.misc.*
import com.google.common.base.Preconditions
import java.io.File import java.io.File
import javax.inject.Inject import javax.inject.Inject
import javax.inject.Singleton import javax.inject.Singleton
@ -38,10 +37,10 @@ public class PublishPlugin @Inject constructor(val files: KFiles, val factory: P
} }
private fun validateProject(project: Project) { private fun validateProject(project: Project) {
Preconditions.checkNotNull(project.name, "Project $project should have a name") requireNotNull(project.name, { "Project $project should have a name" })
Preconditions.checkNotNull(project.version, "Project $project should have a version") requireNotNull(project.version, { "Project $project should have a version" })
Preconditions.checkNotNull(project.group, "Project $project should have a group") requireNotNull(project.group, { "Project $project should have a group" })
Preconditions.checkNotNull(project.artifactId, "Project $project should have a artifactId") requireNotNull(project.artifactId, { "Project $project should have a artifactId" })
} }
private val VALID = arrayListOf(".jar", ".pom") private val VALID = arrayListOf(".jar", ".pom")