diff --git a/.idea/modules/mobibot.iml b/.idea/modules/mobibot.iml index a223542..4d50b07 100644 --- a/.idea/modules/mobibot.iml +++ b/.idea/modules/mobibot.iml @@ -1,5 +1,5 @@ - + @@ -25,27 +25,27 @@ - - - - + + + + - + - - - + + + - + diff --git a/build.gradle b/build.gradle index 7b837d1..d7053d3 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,10 @@ plugins { id 'idea' id 'jacoco' id 'java' + id 'pmd' id "com.github.ben-manes.versions" version "0.21.0" id "com.github.spotbugs" version "1.7.1" - id "net.thauvin.erik.gradle.semver" version "0.9.9-beta" + id "net.thauvin.erik.gradle.semver" version "1.0.0" id "org.sonarqube" version "2.7" } @@ -18,7 +19,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.0.1" +final def semverProcessor = "net.thauvin.erik:semver:1.2.0" mainClassName = packageName + '.Mobibot' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' @@ -28,7 +29,7 @@ compileJava.options.annotationProcessorGeneratedSourcesDirectory = file("${proje ext { log4j = '2.11.2' - spotbugs_annotations = '3.1.12' + spotbugs_annotations = '4.0.0-beta1' } repositories { @@ -76,10 +77,15 @@ dependencies { test { useTestNG() { - suites 'src/test/resources/testng.xml' + suites('src/test/resources/testng.xml') } } +pmd { + ruleSetFiles = files("config/pmd.xml") + ruleSets = [] +} + compileJava { dependsOn('incrementBuildMeta') options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation' @@ -155,7 +161,7 @@ task copyToDeployLib(type: Copy) { into deployDir + '/lib' } -task deploy(dependsOn: ['build']) { +task deploy(dependsOn: ['build', 'jar']) { description = 'Copies all needed files to the ${deployDir} directory.' group = 'Publishing' outputs.dir deployDir diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5f1b120..f4d7b2b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mobibot.ipr b/mobibot.ipr index 5efd501..12cb55c 100644 --- a/mobibot.ipr +++ b/mobibot.ipr @@ -1,5 +1,943 @@ + + + + @@ -74,6 +1031,12 @@ + + @@ -191,6 +1155,19 @@ + + + + @@ -456,6 +1433,9 @@ + + @@ -470,18 +1450,18 @@ - + - + - + - + @@ -524,13 +1504,13 @@ - + - + - + @@ -542,22 +1522,22 @@ - + - + - + - + - + - + @@ -578,13 +1558,13 @@ - + - + - + @@ -661,52 +1641,48 @@ - + - + - + + + + + + + + - + - + - + - + - + - + - - - - - - - - - - - - + - + diff --git a/version.mustache b/version.mustache index 860bfe4..5314f35 100644 --- a/version.mustache +++ b/version.mustache @@ -12,15 +12,15 @@ import java.time.*; * @author Semantic Version Annotation Processor */ public final class {{className}} { - public final static String PROJECT = "{{project}}"; - public final static LocalDateTime BUILDDATE = + public static final String PROJECT = "{{project}}"; + public static final LocalDateTime BUILDDATE = LocalDateTime.ofInstant(Instant.ofEpochMilli({{epoch}}L), ZoneId.systemDefault()); - public final static int MAJOR = {{major}}; - public final static int MINOR = {{minor}}; - public final static int PATCH = {{patch}}; - public final static String PRERELEASE = "{{preRelease}}"; - public final static String BUILDMETA = "{{buildMeta}}"; - public final static String VERSION = "{{version}}"; + public static final int MAJOR = {{major}}; + public static final int MINOR = {{minor}}; + public static final int PATCH = {{patch}}; + public static final String PRERELEASE = "{{preRelease}}"; + public static final String BUILDMETA = "{{buildMeta}}"; + public static final String VERSION = "{{version}}"; /** * Disables the default constructor.