diff --git a/build.gradle b/build.gradle index 65ddc3b..c19e5f0 100644 --- a/build.gradle +++ b/build.gradle @@ -9,18 +9,18 @@ apply plugin: 'application' defaultTasks 'deploy' -def packageName = 'net.thauvin.erik.mobibot' -def deployDir = 'deploy' +final def packageName = 'net.thauvin.erik.mobibot' +final def deployDir = 'deploy' def isRelease = 'release' in gradle.startParameter.taskNames -def semverJar = 'net.thauvin.erik:semver:1.0.1' +final def semverJar = 'net.thauvin.erik:semver:1.0.1' def getVersion(isIncrement = false) { - def propsFile = 'version.properties' - def majorKey = 'version.major' - def minorKey = 'version.minor' - def patchKey = 'version.patch' - def metaKey = 'version.buildmeta' - def preKey = 'version.prerelease' + final def propsFile = 'version.properties' + final def majorKey = 'version.major' + final def minorKey = 'version.minor' + final def patchKey = 'version.patch' + final def metaKey = 'version.buildmeta' + final def preKey = 'version.prerelease' if (isIncrement) { ant.propertyfile(file: propsFile) { entry(key: patchKey, @@ -30,9 +30,9 @@ def getVersion(isIncrement = false) { } } def p = new Properties() - file(propsFile).withInputStream { stream -> p.load(stream) } - def metadata = p.getProperty(metaKey, '') - def prerelease = p.getProperty(preKey, '') + file(propsFile).withInputStream { final stream -> p.load(stream) } + final def metadata = p.getProperty(metaKey, '') + final def prerelease = p.getProperty(preKey, '') return (p.getProperty(majorKey, '1') + '.' + p.getProperty(minorKey, '0') + '.' + p.getProperty(patchKey, '0') + (prerelease.length() > 0 ? '-' + prerelease : '') + (metadata.length() > 0 ? '+' + metadata : '')) } @@ -52,32 +52,32 @@ dependencies { compile 'pircbot:pircbot:1.5.0' compileOnly 'pircbot:pircbot:1.5.0:sources' - compile 'org.apache.logging.log4j:log4j-api:2.9.1' - compile 'org.apache.logging.log4j:log4j-core:2.9.1' - compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1' + compile 'org.apache.logging.log4j:log4j-api:2.10.0' + compile 'org.apache.logging.log4j:log4j-core:2.10.0' + compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.10.0' compile 'commons-cli:commons-cli:1.4' compile 'commons-net:commons-net:3.6' - compile 'com.squareup.okhttp3:okhttp:3.9.0' + compile 'com.squareup.okhttp3:okhttp:3.9.1' - compile 'com.rometools:rome:1.8.0' + compile 'com.rometools:rome:1.9.0' compile 'org.json:json:20171018' compile 'org.ostermiller:utils:1.07.00' - compile 'org.jsoup:jsoup:1.10.3' + compile 'org.jsoup:jsoup:1.11.2' compile 'net.objecthunter:exp4j:0.4.8' compile 'org.twitter4j:twitter4j-core:4.0.6' - compile 'net.thauvin.erik:pinboard-poster:0.9.1' + compile 'net.thauvin.erik:pinboard-poster:0.9.3' // https://bitbucket.org/akapribot/owm-japis compile files('lib/owm-japis-2.5.0.5.jar') compileOnly semverJar - testCompile 'org.testng:testng:6.12' - testCompile 'org.assertj:assertj-core:3.8.0' + testCompile 'org.testng:testng:6.13.1' + testCompile 'org.assertj:assertj-core:3.9.0' } test { diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt index 03e8e89..11f2a28 100644 --- a/kobalt/src/Build.kt +++ b/kobalt/src/Build.kt @@ -57,22 +57,22 @@ val p = project { compile("pircbot:pircbot:1.5.0") //compileOnly("pircbot:pircbot::sources:1.5.0") - compile("org.apache.logging.log4j:log4j-api:2.9.1", - "org.apache.logging.log4j:log4j-core:2.9.1", - "org.apache.logging.log4j:log4j-slf4j-impl:jar:2.9.1") + compile("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:jar:2.10.0") compile("commons-cli:commons-cli:1.4", "commons-net:commons-net:3.6") - compile("com.squareup.okhttp3:okhttp:3.9.0") + compile("com.squareup.okhttp3:okhttp:3.9.1") - compile("com.rometools:rome:1.8.0") + compile("com.rometools:rome:1.9.0") compile("org.json:json:20171018") compile("org.ostermiller:utils:1.07.00") - compile("org.jsoup:jsoup:1.10.3") + compile("org.jsoup:jsoup:1.11.2") compile("net.objecthunter:exp4j:0.4.8") compile("org.twitter4j:twitter4j-core:4.0.6") - compile("net.thauvin.erik:pinboard-poster:0.9.1") + compile("net.thauvin.erik:pinboard-poster:0.9.3") // https://bitbucket.org/akapribot/owm-japis/ compile(file("lib/owm-japis-2.5.0.5.jar")) @@ -82,8 +82,8 @@ val p = project { } dependenciesTest { - compile("org.testng:testng:6.12") - compile("org.assertj:assertj-core:3.8.0") + compile("org.testng:testng:6.13.1") + compile("org.assertj:assertj-core:3.9.0") } apt { diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..578a20b --- /dev/null +++ b/pom.xml @@ -0,0 +1,95 @@ + + + 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 + + +