diff --git a/README.md b/README.md index 6479650..50c335a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Semantic Version Annotation Processor [![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) [![release](https://img.shields.io/github/release/ethauvin/semver.svg)](https://github.com/ethauvin/semver/releases/latest) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/semver/badge.svg)](https://maven-badges.herokuapp.com/maven-central/net.thauvin.erik/semver) [ ![Download](https://api.bintray.com/packages/ethauvin/maven/SemVer/images/download.svg) ](https://bintray.com/ethauvin/maven/SemVer/_latestVersion)\ -[![Known Vulnerabilities](https://snyk.io/test/github/ethauvin/semver/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/ethauvin/semver?targetFile=build.gradle) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_semver&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_semver) [![Build Status](https://travis-ci.org/ethauvin/semver.svg?branch=master)](https://travis-ci.org/ethauvin/semver) [![Build status](https://ci.appveyor.com/api/projects/status/nbv4mxd1gpxtx69o?svg=true)](https://ci.appveyor.com/project/ethauvin/semver) [![CircleCI](https://circleci.com/gh/ethauvin/semver/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/semver/tree/master) +[![Known Vulnerabilities](https://snyk.io/test/github/ethauvin/semver/badge.svg?targetFile=build.gradle)](https://snyk.io/test/github/ethauvin/semver?targetFile=build.gradle) [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=ethauvin_semver&metric=alert_status)](https://sonarcloud.io/dashboard?id=ethauvin_semver) [![Build Status](https://travis-ci.com/ethauvin/semver.svg?branch=master)](https://travis-ci.com/ethauvin/semver) [![Build status](https://ci.appveyor.com/api/projects/status/nbv4mxd1gpxtx69o?svg=true)](https://ci.appveyor.com/project/ethauvin/semver) [![CircleCI](https://circleci.com/gh/ethauvin/semver/tree/master.svg?style=shield)](https://circleci.com/gh/ethauvin/semver/tree/master) An [annotation processor](https://docs.oracle.com/javase/8/docs/api/javax/annotation/processing/Processor.html) that automatically generates a `GeneratedVersion` class based on a [Mustache](https://mustache.github.io/) template and containing the [semantic version](http://semver.org/) (major, minor, patch, etc.) that is read from a [Properties](https://docs.oracle.com/javase/tutorial/essential/environment/properties.html) file or defined in the [annotation](https://docs.oracle.com/javase/tutorial/java/annotations/basics.html). @@ -19,7 +19,6 @@ This processor was inspired by Cédric Beust's [version-processor](https://githu - [Class & Source Generation](#class--source-generation) - [Kotlin](#kotlin) - [Kotlin & Gradle](#kotlin--gradle) -- [Kobalt](#kobalt) - [Auto-Increment](#auto-increment) ## Examples @@ -267,20 +266,6 @@ kapt { The directory containing the configuration files (`version.properties`, `version.mustache`) must be specified using the `semver.project.dir` processor argument. -## Kobalt - -To install and run from [Kobalt](https://beust.com/kobalt/), add the following to [Build.kt](https://github.com/ethauvin/semver/blob/master/examples/java/kobalt/src/Build.kt): - -```gradle -dependencies { - apt("net.thauvin.erik:semver:1.2.0") - compileOnly("net.thauvin.erik:semver:1.2.0") -} -``` - -Please look at [Build.kt](https://github.com/ethauvin/semver/blob/master/examples/java/kobalt/src/Build.kt) in the [examples/java](https://github.com/ethauvin/semver/tree/master/examples/java) directory for a sample. - - ## Auto-Increment Incrementing the version is best left to your favorite build system. For a solution using Gradle, please have a look at the [__Semver Version Plugin for Gradle__](https://github.com/ethauvin/semver-gradle). diff --git a/examples/java/kobalt/src/Build.kt b/examples/java/kobalt/src/Build.kt deleted file mode 100644 index 7394eb4..0000000 --- a/examples/java/kobalt/src/Build.kt +++ /dev/null @@ -1,50 +0,0 @@ -import com.beust.kobalt.* -import com.beust.kobalt.plugin.application.* -import com.beust.kobalt.plugin.apt.* -import com.beust.kobalt.plugin.java.javaCompiler -import com.beust.kobalt.plugin.packaging.* - -// ./kobaltw run - -val bs = buildScript { - repos(localMaven()) -} - -val example = project { - - name = "example" - version = "1.0" - - val mainClassName = "com.example.App" - val processorJar = "net.thauvin.erik:semver:1.2.0" - - dependencies { - apt(processorJar) - compileOnly(processorJar) - } - - apt { - //outputDir = "../src/generated/java/" - } - - javaCompiler { - args("-source", "1.8", "-target", "1.8") - } - - assemble { - jar { - manifest { - attributes("Main-Class", mainClassName) - } - } - } - - application { - mainClass = mainClassName - } - - application { - taskName = "runExample" - mainClass = "com.example.Example" - } -} diff --git a/examples/java/kobalt/wrapper/kobalt-wrapper.jar b/examples/java/kobalt/wrapper/kobalt-wrapper.jar deleted file mode 100644 index 22d3ef5..0000000 Binary files a/examples/java/kobalt/wrapper/kobalt-wrapper.jar and /dev/null differ diff --git a/examples/java/kobalt/wrapper/kobalt-wrapper.properties b/examples/java/kobalt/wrapper/kobalt-wrapper.properties deleted file mode 100644 index 33f1a23..0000000 --- a/examples/java/kobalt/wrapper/kobalt-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -kobalt.version=1.0.129 diff --git a/examples/java/kobaltw b/examples/java/kobaltw deleted file mode 100755 index c5186d5..0000000 --- a/examples/java/kobaltw +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env sh -java -jar "`dirname "$0"`/kobalt/wrapper/kobalt-wrapper.jar" $* diff --git a/examples/java/kobaltw.bat b/examples/java/kobaltw.bat deleted file mode 100644 index d578071..0000000 --- a/examples/java/kobaltw.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -java -jar "%DIRNAME%/kobalt/wrapper/kobalt-wrapper.jar" %* diff --git a/updatewrappers.sh b/updatewrappers.sh index 0074ff2..000f0b6 100644 --- a/updatewrappers.sh +++ b/updatewrappers.sh @@ -19,13 +19,13 @@ green=$(tput setaf 2) red=$(tput setaf 1) std=$(tput sgr0) -if [ "$java8" = true ] -then - export JAVA_HOME="$JAVA8_HOME" - export PATH="$(cygpath "$JAVA_HOME")/bin:$PATH" -fi +#if [ "$java8" = true ] +#then +# export JAVA_HOME="$JAVA8_HOME" +# export PATH="$(cygpath "$JAVA_HOME")/bin:$PATH" +#fi -kVer=$(kobaltw --version | awk '{print substr($2, 1, length($2)-1)}') +#kVer=$(kobaltw --version | awk '{print substr($2, 1, length($2)-1)}') updateWrappers() { curVer="$(gradle --version | awk '/Gradle/ {print $2}')" if [ -d gradle ]; then @@ -36,16 +36,16 @@ updateWrappers() { echo -e " Gradle $curVer UP-TO-DATE" fi fi - if [ -d kobalt ]; then - kw=$(cut -d "=" -f 2 kobalt/wrapper/kobalt-wrapper.properties) - if [ "$kw" = "$kVer" ] - then - echo -e " Kobalt $kw UP-TO-DATE" - else - echo -e "kobalt.version=$kVer" > kobalt/wrapper/kobalt-wrapper.properties - echo -e " Kobalt $kVer ${green}UPDATED${std}" - fi - fi +# if [ -d kobalt ]; then +# kw=$(cut -d "=" -f 2 kobalt/wrapper/kobalt-wrapper.properties) +# if [ "$kw" = "$kVer" ] +# then +# echo -e " Kobalt $kw UP-TO-DATE" +# else +# echo -e "kobalt.version=$kVer" > kobalt/wrapper/kobalt-wrapper.properties +# echo -e " Kobalt $kVer ${green}UPDATED${std}" +# fi +# fi } echo -e "Updating wrappers..."