diff --git a/.idea/modules/mobibot.iml b/.idea/modules/mobibot.iml index 2d27c23..b54e872 100644 --- a/.idea/modules/mobibot.iml +++ b/.idea/modules/mobibot.iml @@ -1,5 +1,5 @@ - + @@ -24,7 +24,10 @@ - + + + + @@ -37,20 +40,14 @@ + + + - - - - - - - - - diff --git a/build.gradle b/build.gradle index 555b0f6..5bb7906 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'application' id "com.github.ben-manes.versions" version "0.20.0" id "org.owasp.dependencycheck" version "3.2.1" - id "net.thauvin.erik.gradle.semver" version "0.9.6-beta" + id "net.thauvin.erik.gradle.semver" version "0.9.8-beta" id "com.github.spotbugs" version "1.6.2" } @@ -16,7 +16,7 @@ defaultTasks 'deploy' final def packageName = 'net.thauvin.erik.mobibot' final def deployDir = 'deploy' def isRelease = 'release' in gradle.startParameter.taskNames -final def semverProcessor = "net.thauvin.erik:semver:1.1.0-beta" +final def semverProcessor = "net.thauvin.erik:semver:1.0.1" mainClassName = packageName + '.Mobibot' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' @@ -43,7 +43,7 @@ dependencies { compile 'commons-cli:commons-cli:1.4' compile 'commons-net:commons-net:3.6' - compile 'com.squareup.okhttp3:okhttp:3.10.0' + compile 'com.squareup.okhttp3:okhttp:3.11.0' compile 'com.rometools:rome:1.11.0' @@ -55,8 +55,7 @@ dependencies { compile 'org.twitter4j:twitter4j-core:4.0.6' compile 'net.thauvin.erik:pinboard-poster:1.0.0' - // https://bitbucket.org/akapribot/owm-japis - compile files('lib/owm-japis-2.5.0.5.jar') + compile 'net.aksingh:owm-japis:2.5.2.2' testCompile 'org.testng:testng:6.14.3' testCompile 'org.assertj:assertj-core:3.10.0' @@ -125,6 +124,16 @@ task deploy(dependsOn: ['build']) { mustRunAfter clean } +incrementBuildMeta { + doFirst { + buildMeta = sprintf("%03d", (buildMeta as Integer) + 1) + } +} + +compileJava { + dependsOn('incrementBuildMeta') +} + task release(dependsOn: ['wrapper', 'clean', 'deploy']) { group = 'Publishing' description = 'Releases new version.' diff --git a/mobibot.ipr b/mobibot.ipr index 690d90b..896fefa 100644 --- a/mobibot.ipr +++ b/mobibot.ipr @@ -363,6 +363,15 @@ + + + + + + + + + @@ -381,13 +390,13 @@ - + - + - + @@ -399,6 +408,24 @@ + + + + + + + + + + + + + + + + + + @@ -417,6 +444,16 @@ + + + + + + + + + + @@ -507,6 +544,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java index bdd3309..35020ee 100644 --- a/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java +++ b/src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java @@ -4,26 +4,28 @@ */ package net.thauvin.erik.mobibot; -import java.util.Date; +import java.time.*; /** * Provides semantic version information. * - * @author Semantic Version Annotation Processor + * @author Semantic Version + * Annotation Processor */ public final class ReleaseInfo { public final static String PRERELEASE_PREFIX = "-"; public final static String BUILDMETA_PREFIX = "+"; - public final static String PROJECT = ""; - public final static Date BUILDDATE = new Date(1531467929376L); + public final static String PROJECT = "mobibot"; + public final static LocalDateTime BUILDDATE = + LocalDateTime.ofInstant(Instant.ofEpochMilli(1531553255553L), ZoneId.systemDefault()); public final static int MAJOR = 0; public final static int MINOR = 7; public final static int PATCH = 3; public final static String PRERELEASE = "beta"; - public final static String BUILDMETA = "1"; + public final static String BUILDMETA = "006"; - /** + /** * The full version string. *

* Formatted as: diff --git a/version.properties b/version.properties index 8fe2cde..02ca2fa 100644 --- a/version.properties +++ b/version.properties @@ -1,7 +1,8 @@ #Generated by the Semver Plugin for Gradle -#Fri Jul 13 00:45:23 PDT 2018 -version.prerelease=beta -version.buildmeta=1 -version.patch=3 +#Sat Jul 14 00:27:34 PDT 2018 +version.buildmeta=006 version.major=0 version.minor=7 +version.patch=3 +version.prerelease=beta +version.project=mobibot