From a312b93bb855859bee03c99b4c714dce97ff92a9 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 18 Apr 2017 00:52:56 -0700 Subject: [PATCH] Cleanup. --- .idea/copyright/Erik_s_Copyright_Notice.xml | 6 ++ .idea/copyright/profiles_settings.xml | 11 +++ .idea/misc.xml | 73 ------------------- .idea/scopes/Source.xml | 3 + example/kobalt/src/Build.kt | 11 +-- .../src/test/kotlin/com/example/MainTest.kt | 8 -- .../plugin/propertyfile/PropertyFilePlugin.kt | 35 ++++++++- src/test/kotlin/com/example/MainTest.kt | 8 -- 8 files changed, 59 insertions(+), 96 deletions(-) create mode 100644 .idea/copyright/Erik_s_Copyright_Notice.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/scopes/Source.xml delete mode 100644 example/src/test/kotlin/com/example/MainTest.kt delete mode 100644 src/test/kotlin/com/example/MainTest.kt diff --git a/.idea/copyright/Erik_s_Copyright_Notice.xml b/.idea/copyright/Erik_s_Copyright_Notice.xml new file mode 100644 index 0000000..08660a1 --- /dev/null +++ b/.idea/copyright/Erik_s_Copyright_Notice.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..5e22e90 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,11 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 6ebe78f..9dea2e2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,79 +1,6 @@ - - - - - - - - - Java - - - Portability issuesJava - - - - - Android - - - - - - - - - - commons-logging-api - - - - - - - - 1.8.x - - - - - - - - 1.8.x - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/Source.xml b/.idea/scopes/Source.xml new file mode 100644 index 0000000..4be887e --- /dev/null +++ b/.idea/scopes/Source.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/example/kobalt/src/Build.kt b/example/kobalt/src/Build.kt index 2bc9d77..8f18b2a 100644 --- a/example/kobalt/src/Build.kt +++ b/example/kobalt/src/Build.kt @@ -15,7 +15,6 @@ val p = project { version = "0.1" dependencies { - // compile("com.beust:jcommander:1.68") } dependenciesTest { @@ -42,11 +41,13 @@ val p = project { entry(key = "date.nextMonth", value = "0", type = Types.DATE, unit = Units.MONTH, operation = Operations.ADD) entry(key = "akey", value = "avalue") entry(key = "adate", type = Types.DATE, value = "now") - entry(key = "aint", type = Types.INT, default = "0", operation = Operations.ADD) + entry(key = "anint", type = Types.INT, default = "0", operation = Operations.ADD) entry(key = "formated.int", type = Types.INT, default = "0013", operation = Operations.ADD, pattern = "0000") entry(key = "formated.date", type = Types.DATE, value = "now", pattern = "DDD HH:mm") - entry(key = "formated.date-1", type = Types.DATE, default = "now", pattern="DDD", operation = Operations.SUBTRACT, value = "1") - entry(key = "formated.tomorrow", type = Types.DATE, default = "now", pattern="DDD", operation = Operations.ADD, value = "1") - entry(key = "progress", default = "", operation = Operations.ADD, value="1") + entry(key = "formated.date-1", type = Types.DATE, default = "now", pattern = "DDD", + operation = Operations.SUBTRACT, value = "1") + entry(key = "formated.tomorrow", type = Types.DATE, default = "now", pattern = "DDD", + operation = Operations.ADD, value = "1") + entry(key = "progress", default = "", operation = Operations.ADD, value = "1") } } diff --git a/example/src/test/kotlin/com/example/MainTest.kt b/example/src/test/kotlin/com/example/MainTest.kt deleted file mode 100644 index 96458e9..0000000 --- a/example/src/test/kotlin/com/example/MainTest.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.example - -import org.testng.annotations.Test - -class ExampleTest { - @Test - fun f() = println("Running test") -} \ No newline at end of file diff --git a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/propertyfile/PropertyFilePlugin.kt b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/propertyfile/PropertyFilePlugin.kt index 21cefca..91ad828 100644 --- a/src/main/kotlin/net/thauvin/erik/kobalt/plugin/propertyfile/PropertyFilePlugin.kt +++ b/src/main/kotlin/net/thauvin/erik/kobalt/plugin/propertyfile/PropertyFilePlugin.kt @@ -1,3 +1,34 @@ +/* + * PropertyFilePlugin.kt + * + * Copyright (c) 2017, Erik C. Thauvin (erik@thauvin.net) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * Neither the name of this project nor the names of its contributors may be + * used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ package net.thauvin.erik.kobalt.plugin.propertyfile import com.beust.kobalt.Plugins @@ -110,7 +141,7 @@ class PropertyFilePlugin @Inject constructor(val configActor: ConfigActor() @Suppress("unused") diff --git a/src/test/kotlin/com/example/MainTest.kt b/src/test/kotlin/com/example/MainTest.kt deleted file mode 100644 index 96458e9..0000000 --- a/src/test/kotlin/com/example/MainTest.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.example - -import org.testng.annotations.Test - -class ExampleTest { - @Test - fun f() = println("Running test") -} \ No newline at end of file