diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt deleted file mode 100644 index 470b118..0000000 --- a/kobalt/src/Build.kt +++ /dev/null @@ -1,145 +0,0 @@ -import com.beust.kobalt.* -import com.beust.kobalt.api.Project -import com.beust.kobalt.api.annotation.Task -import com.beust.kobalt.misc.KobaltLogger -import com.beust.kobalt.misc.log -import com.beust.kobalt.plugin.application.application -import com.beust.kobalt.plugin.apt.apt -import com.beust.kobalt.plugin.java.javadoc -import com.beust.kobalt.plugin.packaging.assemble -import com.beust.kobalt.plugin.packaging.install -import com.beust.kobalt.plugin.publish.autoGitTag -import net.thauvin.erik.kobalt.plugin.pom2xml.pom2xml -import java.io.File -import java.io.FileInputStream -import java.util.* - -val bs = buildScript { - repos(localMaven()) - plugins("net.thauvin.erik:kobalt-pom2xml:") -} - -val mainClassName = "net.thauvin.erik.mobibot.Mobibot" -val deploy = "deploy" - -fun StringBuilder.prepend(s: String): StringBuilder { - if (this.isNotEmpty()) { - this.insert(0, s) - } - return this -} - -val p = project { - - name = "mobibot" - - fun versionFor(): String { - val propsFile = "version.properties" - val majorKey = "version.major" - val minorKey = "version.minor" - val patchKey = "version.patch" - val metaKey = "version.buildmeta" - val preKey = "version.prerelease" - - val p = Properties().apply { FileInputStream(propsFile).use { fis -> load(fis) } } - - return (p.getProperty(majorKey, "1") + "." + p.getProperty(minorKey, "0") + "." + p.getProperty(patchKey, "0") - + StringBuilder(p.getProperty(preKey, "")).prepend("-") - + StringBuilder(p.getProperty(metaKey, "")).prepend("+")) - } - - version = versionFor() - - val processorJar = "net.thauvin.erik:semver:1.0.1" - val lib = "lib" - - dependencies { - compile("pircbot:pircbot:1.5.0") - //compileOnly("pircbot:pircbot::sources:1.5.0") - - compile("org.apache.logging.log4j:log4j-api:2.11.0", - "org.apache.logging.log4j:log4j-core:2.11.0", - "org.apache.logging.log4j:log4j-slf4j-impl:jar:2.11.0") - - compile("commons-cli:commons-cli:1.4", "commons-net:commons-net:3.6") - compile("com.squareup.okhttp3:okhttp:3.11.0") - - compile("com.rometools:rome:1.11.0") - - compile("org.json:json:20180130") - compile("org.ostermiller:utils:1.07.00") - compile("org.jsoup:jsoup:1.11.3") - compile("net.objecthunter:exp4j:0.4.8") - - compile("org.twitter4j:twitter4j-core:4.0.6") - compile("net.thauvin.erik:pinboard-poster:1.0.0") - - compile("net.aksingh:owm-japis:2.5.2.2") - - apt(processorJar) - compileOnly(processorJar) - - compileOnly("com.github.spotbugs:spotbugs-annotations:3.1.5") - } - - dependenciesTest { - compile("org.testng:testng:6.14.3") - compile("org.assertj:assertj-core:3.10.0") - } - - apt { - outputDir = "../src/generated/java/" - } - - autoGitTag { - enabled = true - message = "Version $version" - annotated = true - } - - assemble { - jar { - name = "${project.name}.jar" - manifest { - attributes("Main-Class", mainClassName) - attributes("Class-Path", - collect(compileDependencies) - .map { it.file.name } - .joinToString(" ./$lib/", prefix = ". ./$lib/")) - } - } - } - - application { - mainClass = mainClassName - args("-v") - } - - install { - target = deploy - include(from("kobaltBuild/libs"), to(target), glob("**/*")) - include(from("properties"), to(target), glob("**/*")) - collect(compileDependencies) - .forEach { - copy(from(it.file.absolutePath), to("$target/$lib")) - } - } - - javadoc { - title = project.name + ' ' + project.version - tags("created") - author = true - links("http://www.jibble.org/javadocs/pircbot/", "http://docs.oracle.com/javase/8/docs/api/") - } - - pom2xml { - - } -} - -@Task(name = "deploy", dependsOn = arrayOf("assemble", "install"), description = "Deploy application") -fun deploy(project: Project): TaskResult { - File("$deploy/logs").mkdir() - KobaltLogger.log(1, " Deployed to " + File(deploy).absolutePath) - return TaskResult() -} diff --git a/kobalt/wrapper/kobalt-wrapper.jar b/kobalt/wrapper/kobalt-wrapper.jar deleted file mode 100644 index 3acc29a..0000000 Binary files a/kobalt/wrapper/kobalt-wrapper.jar and /dev/null differ diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties deleted file mode 100644 index f16e1df..0000000 --- a/kobalt/wrapper/kobalt-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -kobalt.version=1.0.118 \ No newline at end of file diff --git a/kobaltw b/kobaltw deleted file mode 100755 index c5186d5..0000000 --- a/kobaltw +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env sh -java -jar "`dirname "$0"`/kobalt/wrapper/kobalt-wrapper.jar" $* diff --git a/kobaltw.bat b/kobaltw.bat deleted file mode 100644 index d578071..0000000 --- a/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/pom.xml b/pom.xml deleted file mode 100644 index 578a20b..0000000 --- a/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - 4.0.0 - 0.7.2-beta+030 - mobibot - - - - pircbot - pircbot - 1.5.0 - - - org.apache.logging.log4j - log4j-api - 2.10.0 - - - org.apache.logging.log4j - log4j-core - 2.10.0 - - - org.apache.logging.log4j - log4j-slf4j-impl - 2.10.0 - - - commons-cli - commons-cli - 1.4 - - - commons-net - commons-net - 3.6 - - - com.squareup.okhttp3 - okhttp - 3.9.1 - - - com.rometools - rome - 1.9.0 - - - org.json - json - 20171018 - - - org.ostermiller - utils - 1.07.00 - - - org.jsoup - jsoup - 1.11.2 - - - net.objecthunter - exp4j - 0.4.8 - - - org.twitter4j - twitter4j-core - 4.0.6 - - - net.thauvin.erik - pinboard-poster - 0.9.3 - - - K:\java\mobibot\.\lib\owm-japis-2.5.0.5.jar - - - org.testng - testng - 6.13.1 - test - - - org.assertj - assertj-core - 3.9.0 - test - - -