From 54822780ff78328ccc845600e82b046bd4c3f2b8 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 29 May 2017 19:04:46 -0700 Subject: [PATCH] Added cirlceci configuration. --- README.md | 2 +- circle.yml | 13 +++++++++++++ example/kobalt/src/Build.kt | 2 +- kobalt/src/Build.kt | 9 +++++---- pom.xml | 7 +------ 5 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 circle.yml diff --git a/README.md b/README.md index f33cbf7..3efd000 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # VersionEye plug-in for [Kobalt](http://beust.com/kobalt/home/index.html) -[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![Build Status](https://travis-ci.org/ethauvin/kobalt-versioneye.svg?branch=master)](https://travis-ci.org/ethauvin/kobalt-versioneye) [![Dependency Status](https://www.versioneye.com/user/projects/58ff729f6ac171425cd00acf/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/58ff729f6ac171425cd00acf) [![Download](https://api.bintray.com/packages/ethauvin/maven/kobalt-versioneye/images/download.svg) ](https://bintray.com/ethauvin/maven/kobalt-versioneye/_latestVersion) +[![License (3-Clause BSD)](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](http://opensource.org/licenses/BSD-3-Clause) [![Build Status](https://travis-ci.org/ethauvin/kobalt-versioneye.svg?branch=master)](https://travis-ci.org/ethauvin/kobalt-versioneye) [![Dependency Status](https://www.versioneye.com/user/projects/58ff729f6ac171425cd00acf/badge.svg?style=flat-square)](https://www.versioneye.com/user/projects/58ff729f6ac171425cd00acf) [![CircleCI](https://circleci.com/gh/ethauvin/kobalt-versioneye/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/kobalt-versioneye/tree/master) [![Download](https://api.bintray.com/packages/ethauvin/maven/kobalt-versioneye/images/download.svg) ](https://bintray.com/ethauvin/maven/kobalt-versioneye/_latestVersion) [![VersionEye Logo](src/site/images/VersionEyeLogo.png)](https://www.versioneye.com) diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..4624b95 --- /dev/null +++ b/circle.yml @@ -0,0 +1,13 @@ +machine: + java: + version: oraclejdk8 + +dependencies: + override: + - chmod +x kobaltw + +test: + override: + - ./kobaltw assemble test + post: + - cp -r kobaltBuild/test-output/* $CIRCLE_TEST_REPORTS/ \ No newline at end of file diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 0978072..05337da 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -6,7 +6,7 @@ import net.thauvin.erik.kobalt.plugin.versioneye.* // ./kobaltw versionEye val bs = buildScript { - //repos(file("K:/maven/repository")) + repos(localMaven()) plugins("net.thauvin.erik:kobalt-versioneye:") } diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 5ac6613..d751a4f 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -1,5 +1,6 @@ import com.beust.kobalt.buildScript import com.beust.kobalt.file +import com.beust.kobalt.localMaven import com.beust.kobalt.plugin.packaging.assemble import com.beust.kobalt.plugin.publish.autoGitTag import com.beust.kobalt.plugin.publish.bintray @@ -12,7 +13,7 @@ import org.apache.maven.model.Model import org.apache.maven.model.Scm val bs = buildScript { - repos(file("K:/maven/repository")) + repos(localMaven()) plugins("net.thauvin.erik:kobalt-maven-local:", "net.thauvin.erik:kobalt-versioneye:") } @@ -24,7 +25,7 @@ val p = project { name = "kobalt-versioneye" group = "net.thauvin.erik" artifactId = name - version = "0.4.5" + version = "0.4.6" pom = Model().apply { description = "VersionEye plug-in for the Kobalt build system." @@ -47,11 +48,11 @@ val p = project { dependencies { compileOnly("com.beust:$kobaltDependency:") - compile("com.squareup.okhttp3:logging-interceptor:jar:3.7.0") + compile("com.squareup.okhttp3:logging-interceptor:jar:3.8.0") } dependenciesTest { - compile("org.testng:testng:") + compile("org.testng:testng:6.11") } assemble { diff --git a/pom.xml b/pom.xml index 7c862bc..9bdd90e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 net.thauvin.erik kobalt-versioneye - 0.4.5 + 0.4.6 kobalt-versioneye VersionEye plug-in for the Kobalt build system. https://github.com/ethauvin/kobalt-versioneye @@ -27,11 +27,6 @@ https://github.com/ethauvin/kobalt-versioneye - - com.beust - kobalt-plugin-api - (0,] - com.squareup.okhttp3 logging-interceptor