From 853fc484b6c2679f895fd463789ef5bf26e2673d Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 25 Apr 2017 11:01:32 -0700 Subject: [PATCH 01/13] Removed version number in plugin, for TravisCI. --- kobalt/src/Build.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index dcea96d..17b0f42 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -13,7 +13,7 @@ import org.apache.maven.model.Scm val bs = buildScript { repos(file("K:/maven/repository")) - plugins("net.thauvin.erik:kobalt-maven-local:", "net.thauvin.erik:kobalt-versioneye:0.4.5") + plugins("net.thauvin.erik:kobalt-maven-local:", "net.thauvin.erik:kobalt-versioneye:") } val dev by profile() From 0f995f08ca042d51c0ffcc354b94ba32ca0f6cca Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 26 Apr 2017 20:01:11 -0700 Subject: [PATCH 02/13] Changed to compileOnly for kobalt-plugin-api. --- kobalt/src/Build.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 17b0f42..5ac6613 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -46,7 +46,7 @@ val p = project { } dependencies { - compile("com.beust:$kobaltDependency:") + compileOnly("com.beust:$kobaltDependency:") compile("com.squareup.okhttp3:logging-interceptor:jar:3.7.0") } @@ -76,6 +76,8 @@ val p = project { } versionEye { + org = "thauvin" + team = "Owners" pom = true } } \ No newline at end of file From 72e9fbec285b741ef4581d5eb96e0d3a46bbb474 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Wed, 26 Apr 2017 20:01:47 -0700 Subject: [PATCH 03/13] Don't save the projectKey if temp is specified. --- .../thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt index 115a355..4b4889c 100644 --- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt +++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/versioneye/VersionEyePlugin.kt @@ -239,8 +239,8 @@ class VersionEyePlugin @Inject constructor(val configActor: ConfigActor Date: Wed, 26 Apr 2017 20:02:35 -0700 Subject: [PATCH 04/13] Added ability to specify version number as an argument. --- clean.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/clean.sh b/clean.sh index 6d6ee30..552252d 100644 --- a/clean.sh +++ b/clean.sh @@ -12,15 +12,21 @@ buildkt="kobalt/src/Build.kt" name=$(cat $buildkt | grep -m 1 "name = " | cut -d"\"" -f 2) group=$(cat $buildkt | grep -m 1 "group = " | cut -d"\"" -f 2) -version=$(cat $buildkt | grep -m 1 "version = " | cut -d"\"" -f 2) + +if [ -z "$1" ]; then + version=$(cat $buildkt | grep -m 1 "version = " | cut -d"\"" -f 2) +else + version="$1" +fi maven="/k/maven/repository/${group//.//}/${name}/${version}" kobalt="$HOME/.kobalt/cache/${group//.//}/${name}/${version}" +localRepo="$HOME/.kobalt/localMavenRepo/${group//.//}/${name}/${version}" read -p "Delete version ${version}? " -n 1 -r echo if [[ $REPLY =~ ^[Yy]$ ]]; then - for dir in "$kobalt" "$maven"; do + for dir in "$kobalt" "$maven" "$localRepo"; do if [ -d "$dir" ]; then echo -e "Deleting : \e[32;1m$dir\e[0m" $rm "$dir" From 3db287d98bb44f980a02b7a2d9a7f1420f11518b Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Mon, 29 May 2017 19:00:31 -0700 Subject: [PATCH 05/13] Kobalt 1.0.86 update. --- .idea/kobalt.xml | 2 +- .../kobalt/wrapper/kobalt-wrapper.properties | 2 +- kobalt-versioneye.iml | 594 ------------------ kobalt/Build.kt.iml | 10 +- kobalt/wrapper/kobalt-wrapper.properties | 2 +- 5 files changed, 8 insertions(+), 602 deletions(-) diff --git a/.idea/kobalt.xml b/.idea/kobalt.xml index 6676523..c44bad8 100644 --- a/.idea/kobalt.xml +++ b/.idea/kobalt.xml @@ -5,7 +5,7 @@