erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Upgraded to ROME 1.6.1

Browse source 
Added run arguments to build.gradle
This commit is contained in:
Erik C. Thauvin 2016-06-26 18:09:42 -07:00
parent 77f2f5c218
commit 62c011234e
13 changed files with 362 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.idea/modules/mobibot.iml generated Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.6.1-beta+004" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../..">
<excludeFolder url="file://$MODULE_DIR$/../../.gradle" />
<excludeFolder url="file://$MODULE_DIR$/../../build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

15
.idea/modules/mobibot_annotationProcessor.iml generated Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="mobibot:annotationProcessor" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.6.1-beta+004" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../build/classes/annotationProcessor" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../src/annotationProcessor">
<sourceFolder url="file://$MODULE_DIR$/../../src/annotationProcessor/resources" type="java-resource" />
</content>
<content url="file://$MODULE_DIR$/../../src/generated">
<sourceFolder url="file://$MODULE_DIR$/../../src/generated/java" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

35
.idea/modules/mobibot_main.iml generated Normal file
View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="mobibot:main" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.6.1-beta+004" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../build/classes/main" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../src/main">
<sourceFolder url="file://$MODULE_DIR$/../../src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../../src/main/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Gradle: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: commons-net:commons-net:3.5" level="project" />
<orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.3.1" level="project" />
<orderEntry type="library" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.9.2" level="project" />
<orderEntry type="library" name="Gradle: com.rometools:rome:1.6.1" level="project" />
<orderEntry type="library" name="Gradle: com.rometools:rome-fetcher:1.6.1" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20160212" level="project" />
<orderEntry type="library" name="Gradle: org.ostermiller:utils:1.07.00" level="project" />
<orderEntry type="library" name="Gradle: net.sourceforge.jweather:jweather:0.3.0" level="project" />
<orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.7" level="project" />
<orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.4" level="project" />
<orderEntry type="library" name="Gradle: net.sf.delicious-java:delicious:1.14" level="project" />
<orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.5-beta" level="project" />
<orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
</component>
</module>

37
.idea/modules/mobibot_test.iml generated Normal file
View file

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="mobibot:test" external.linked.project.path="$MODULE_DIR$/../.." external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="" external.system.module.type="sourceSet" external.system.module.version="0.6.1-beta+004" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
<output-test url="file://$MODULE_DIR$/../../build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$/../../src/test">
<sourceFolder url="file://$MODULE_DIR$/../../src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/../../src/test/resources" type="java-test-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="mobibot_main" />
<orderEntry type="library" name="Gradle: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: commons-net:commons-net:3.5" level="project" />
<orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.3.1" level="project" />
<orderEntry type="library" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom2:2.0.6" level="project" />
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.9.2" level="project" />
<orderEntry type="library" name="Gradle: com.rometools:rome:1.6.1" level="project" />
<orderEntry type="library" name="Gradle: com.rometools:rome-fetcher:1.6.1" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20160212" level="project" />
<orderEntry type="library" name="Gradle: org.ostermiller:utils:1.07.00" level="project" />
<orderEntry type="library" name="Gradle: net.sourceforge.jweather:jweather:0.3.0" level="project" />
<orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.7" level="project" />
<orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.4" level="project" />
<orderEntry type="library" name="Gradle: net.sf.delicious-java:delicious:1.14" level="project" />
<orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.5-beta" level="project" />
<orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
</component>
<component name="TestModuleProperties" production-module="mobibot_main" />
</module>

30
build.gradle
View file

@ -1,15 +1,17 @@
buildscript { buildscript {
repositories { repositories {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.coders-kitchen:compileonlyplugin:1.0.0' classpath 'com.coders-kitchen:compileonlyplugin:1.0.0'
} }
} }
plugins { plugins {
id "com.ewerk.gradle.plugins.annotation-processor" version "1.0.2" id "com.ewerk.gradle.plugins.annotation-processor" version "1.0.2"
id "com.github.ben-manes.versions" version "0.12.0" id "com.github.ben-manes.versions" version "0.12.0"
} }
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'idea' apply plugin: 'idea'
apply plugin: 'application' apply plugin: 'application'
@ -21,14 +23,16 @@ def packageName = 'net.thauvin.erik.mobibot'
def deployDir = 'deploy' def deployDir = 'deploy'
def isRelease = 'release' in gradle.startParameter.taskNames def isRelease = 'release' in gradle.startParameter.taskNames
def getVersion(isIncrement = false) { def getVersion(isIncrement = false)
{
def propsFile = 'version.properties' def propsFile = 'version.properties'
def majorKey = 'version.major' def majorKey = 'version.major'
def minorKey = 'version.minor' def minorKey = 'version.minor'
def patchKey = 'version.patch' def patchKey = 'version.patch'
def metaKey = 'version.buildmeta' def metaKey = 'version.buildmeta'
def preKey = 'version.prerelease' def preKey = 'version.prerelease'
if (isIncrement) { if (isIncrement)
{
ant.propertyfile(file: propsFile) { ant.propertyfile(file: propsFile) {
entry(key: patchKey, entry(key: patchKey,
type: 'int', type: 'int',
@ -67,11 +71,8 @@ dependencies {
compile 'oro:oro:2.0.8' compile 'oro:oro:2.0.8'
compile 'org.jdom:jdom:1.1.3'
compile 'org.jdom:jdom2:2.0.6'
compile 'org.jsoup:jsoup:1.9.2' compile 'org.jsoup:jsoup:1.9.2'
compile 'rome:rome:1.0@jar' compile 'com.rometools:rome:1.6.1'
compile 'rome:rome-fetcher:1.0@jar'
compile 'org.json:json:20160212' compile 'org.json:json:20160212'
compile 'org.ostermiller:utils:1.07.00' compile 'org.ostermiller:utils:1.07.00'
@ -109,6 +110,10 @@ clean {
delete deployDir delete deployDir
} }
run {
args '--v'
}
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = gradle.gradleVersion gradleVersion = gradle.gradleVersion
} }
@ -138,6 +143,7 @@ task deploy(dependsOn: ['build']) {
mustRunAfter clean mustRunAfter clean
} }
task release(dependsOn: ['deploy', 'wrapper']) << { task release(dependsOn: ['deploy', 'wrapper']) << {
group = 'Publishing' group = 'Publishing'
description = 'Releases new version.' description = 'Releases new version.'

42
mobibot.iml
View file

@ -1,42 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="mobibot" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="0.6.1-beta+002" relativePaths="false" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/generated/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/annotationProcessor/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" exported="" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" exported="" name="Gradle: rome:rome:1.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: rome:rome-fetcher:1.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.ostermiller:utils:1.07.00" level="project" />
<orderEntry type="library" exported="" name="Gradle: net.sourceforge.jweather:jweather:0.3.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: net.sf.delicious-java:delicious:1.14" level="project" />
<orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.4" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" />
<orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.5" level="project" />
<orderEntry type="library" name="Gradle: org.apache.velocity:velocity:1.7" level="project" />
<orderEntry type="library" name="Gradle: commons-collections:commons-collections:3.2.1" level="project" />
<orderEntry type="library" name="Gradle: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Gradle: commons-net:commons-net:3.4" level="project" />
<orderEntry type="library" name="Gradle: commons-cli:commons-cli:1.3.1" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom:2.0.2" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20151123" level="project" />
<orderEntry type="library" name="Gradle: net.thauvin.erik:semver:0.9.5-beta" level="project" />
</component>
</module>

219
mobibot.ipr
View file

@ -69,6 +69,11 @@
<processorPath useClasspath="true" /> <processorPath useClasspath="true" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel>
<module name="mobibot_annotationProcessor" target="1.8" />
<module name="mobibot_main" target="1.8" />
<module name="mobibot_test" target="1.8" />
</bytecodeTargetLevel>
</component> </component>
<component name="CopyrightManager" default="Mobibot"> <component name="CopyrightManager" default="Mobibot">
<copyright> <copyright>
@ -121,9 +126,14 @@
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="createEmptyContentRootDirectories" value="true" /> <option name="createEmptyContentRootDirectories" value="true" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="C:/gradle" /> <option name="gradleHome" value="C:/gradle" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>
@ -364,10 +374,13 @@
</component> </component>
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/mobibot.iml" filepath="$PROJECT_DIR$/mobibot.iml" /> <module fileurl="file://$PROJECT_DIR$/.idea/modules/mobibot.iml" filepath="$PROJECT_DIR$/.idea/modules/mobibot.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/mobibot_annotationProcessor.iml" filepath="$PROJECT_DIR$/.idea/modules/mobibot_annotationProcessor.iml" group="mobibot" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/mobibot_main.iml" filepath="$PROJECT_DIR$/.idea/modules/mobibot_main.iml" group="mobibot" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/mobibot_test.iml" filepath="$PROJECT_DIR$/.idea/modules/mobibot_test.iml" group="mobibot" />
</modules> </modules>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.8.x" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" assert-keyword="true" jdk-15="true" project-jdk-name="1.8.x" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
<component name="ResourceManagerContainer"> <component name="ResourceManagerContainer">
@ -392,4 +405,204 @@
</value> </value>
</option> </option>
</component> </component>
<component name="libraryTable">
<library name="Gradle: com.rometools:rome-fetcher:1.6.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome-fetcher/1.6.1/8bd348969d209e634317bf6db3b8be17d85f7674/rome-fetcher-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome-fetcher/1.6.1/e412a4f83403d12bbf90370832d1649688c3fd/rome-fetcher-1.6.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: com.rometools:rome:1.6.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.6.1/fb844f8d9b7c1e324d150ca6ebb791cfd9b33243/rome-1.6.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.rometools/rome/1.6.1/d5c50cf970dde36378a5f7bf8b2273e82723535/rome-1.6.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-cli:commons-cli:1.3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.3.1/1303efbc4b181e5a58bf2e967dc156a3132b97c0/commons-cli-1.3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.3.1/12ec02d8cb9fbb33bd05506109a4fc8bcc3578/commons-cli-1.3.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-codec:commons-codec:1.10">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/4b95f4897fa13f2cd904aee711aeafc0c5295cd8/commons-codec-1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/11fb3d88ae7e3b757d70237064210ceb954a5a04/commons-codec-1.10-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-collections:commons-collections:3.2.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/761ea405b9b37ced573d2df0d1e3a4e0f9edc668/commons-collections-3.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-collections/commons-collections/3.2.1/fa095ef874374e5b2a11f8b06c26a5d68c7cb3a4/commons-collections-3.2.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-httpclient:commons-httpclient:3.1">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-httpclient/commons-httpclient/3.1/964cd74171f427720480efdec40a7c7f6e58426a/commons-httpclient-3.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-httpclient/commons-httpclient/3.1/c6d6ea83d0cf16d3ed9c1b7e600fa0f60b9d3159/commons-httpclient-3.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-lang:commons-lang:2.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/16313e02a793435009f1e458fa4af5d879f6fb11/commons-lang-2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-lang/commons-lang/2.4/2b8c4b3035e45520ef42033e823c7d33e4b4402c/commons-lang-2.4-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-logging:commons-logging:1.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/ecf26c7507d67782a3bbd148d170b31dfad001aa/commons-logging-1.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-net:commons-net:3.5">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.5/342fc284019f590e1308056990fdb24a08f06318/commons-net-3.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/3.5/185dea3736a8583323da4d6ce647719ddf452ccf/commons-net-3.5-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: log4j:log4j:1.2.17">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/5af35056b4d257e4b64b9e8069c0746e8b08629f/log4j-1.2.17.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/677abe279b68c5e7490d6d50c6951376238d7d3e/log4j-1.2.17-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: net.objecthunter:exp4j:0.4.7">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.7/f910cbcc730e5bd5e7699d8c14905c07c6c12d47/exp4j-0.4.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.7/26e7ad8ecde8e7bb1e9d465e8a0b6ffe8dbca2ea/exp4j-0.4.7-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: net.sf.delicious-java:delicious:1.14">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.delicious-java/delicious/1.14/6fdcbf3ef291e2a2352fc4c27fe033f02206ee1a/delicious-1.14.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.delicious-java/delicious/1.14/af3389b4f23bb9ac23552bff5ae6ed917df36192/delicious-1.14-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: net.sourceforge.jweather:jweather:0.3.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.jweather/jweather/0.3.0/8bb010d54c64e66b1738524513b50ed263c35290/jweather-0.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.jweather/jweather/0.3.0/385ecc27f62f9d7c31de57cee468a8df58cb415e/jweather-0.3.0-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: net.thauvin.erik:semver:0.9.5-beta">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.5-beta/semver-0.9.5-beta.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/thauvin/erik/semver/0.9.5-beta/semver-0.9.5-beta-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.apache.velocity:velocity:1.7">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.velocity/velocity/1.7/2ceb567b8f3f21118ecdec129fe1271dbc09aa7a/velocity-1.7.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.velocity/velocity/1.7/eb11eb70171ed64842b2e5216d5904e21ed162ac/velocity-1.7-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.jdom:jdom2:2.0.6">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/6f14738ec2e9dd0011e343717fa624a10f8aab64/jdom2-2.0.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom2/2.0.6/3dcf8ba7582eeac3b67ed5155ee3659e16c8dadc/jdom2-2.0.6-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.json:json:20160212">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20160212/a742e3f85161835b95877478c5dd5b405cefaab9/json-20160212.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20160212/6b4ee9a02a4ed9eb92efe6104c424f70c822c8c8/json-20160212-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.jsoup:jsoup:1.9.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.9.2/5e3bda828a80c7a21dfbe2308d1755759c2fd7b4/jsoup-1.9.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.9.2/97441f4a0f6bb4c2d9f1e19321f4a45c9ffd0e2c/jsoup-1.9.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.ostermiller:utils:1.07.00">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ostermiller/utils/1.07.00/a8828217b2dd0507fbe9e9d0b2981acfb908b590/utils-1.07.00.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ostermiller/utils/1.07.00/586774ee4b8409b6835621bae2186d9b54d1c36a/utils-1.07.00-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.twitter4j:twitter4j-core:4.0.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.4/1f3c896c7b2f20c51103078ccf0bc2ea97ac012a/twitter4j-core-4.0.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.4/5fb9d7d5700c56e9a5202a95a2fd6c2159cb33b7/twitter4j-core-4.0.4-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: oro:oro:2.0.8">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/oro/oro/2.0.8/5592374f834645c4ae250f4c9fbb314c9369d698/oro-2.0.8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/oro/oro/2.0.8/3598e790ecd76ff7eb249853d4d00822ae1a5e71/oro-2.0.8-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: pircbot:pircbot:1.5.0">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/7a9dd235e6e81db733212202cc4067b5625650cf/pircbot-1.5.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/pircbot/pircbot/1.5.0/cc27715d1c9c8246beb6a33ea099a9ca5d4e5da1/pircbot-1.5.0-sources.jar!/" />
</SOURCES>
</library>
</component>
</project> </project>

4
src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
View file

@ -13,8 +13,8 @@ import java.util.Date;
* Annotation Processor</a> * Annotation Processor</a>
*/ */
public final class ReleaseInfo { public final class ReleaseInfo {
private final static String buildmeta = "004"; private final static String buildmeta = "005";
private final static Date date = new Date(1466883211201L); private final static Date date = new Date(1466989732969L);
private final static int major = 0; private final static int major = 0;
private final static int minor = 6; private final static int minor = 6;
private final static int patch = 1; private final static int patch = 1;

15
src/main/java/net/thauvin/erik/mobibot/EntriesMgr.java
View file

@ -31,10 +31,10 @@
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import com.sun.syndication.feed.synd.*; import com.rometools.rome.feed.synd.*;
import com.sun.syndication.io.FeedException; import com.rometools.rome.io.FeedException;
import com.sun.syndication.io.SyndFeedInput; import com.rometools.rome.io.SyndFeedInput;
import com.sun.syndication.io.SyndFeedOutput; import com.rometools.rome.io.SyndFeedOutput;
import java.io.*; import java.io.*;
import java.util.ArrayList; import java.util.ArrayList;
@ -139,8 +139,8 @@ final class EntriesMgr
* *
* @return The feed's last published date. * @return The feed's last published date.
* *
* @throws java.io.FileNotFoundException If the file was not found. * @throws FileNotFoundException If the file was not found.
* @throws com.sun.syndication.io.FeedException If an error occurred while reading the feed. * @throws FeedException If an error occurred while reading the feed.
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static String loadEntries(final String file, final String channel, final List<EntryLink> entries) public static String loadEntries(final String file, final String channel, final List<EntryLink> entries)
@ -222,7 +222,8 @@ final class EntriesMgr
* @param history The history array. * @param history The history array.
* @param isDayBackup Set the true if the daily backup file should also be created. * @param isDayBackup Set the true if the daily backup file should also be created.
*/ */
public static void saveEntries(final Mobibot bot, final List<EntryLink> entries, final List<String> history, final boolean isDayBackup) public static void saveEntries(final Mobibot bot, final List<EntryLink> entries, final List<String> history,
final boolean isDayBackup)
{ {
if (bot.getLogger().isDebugEnabled()) if (bot.getLogger().isDebugEnabled())
{ {

15
src/main/java/net/thauvin/erik/mobibot/EntryLink.java
View file

@ -31,7 +31,8 @@
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import com.sun.syndication.feed.synd.SyndCategoryImpl; import com.rometools.rome.feed.synd.SyndCategory;
import com.rometools.rome.feed.synd.SyndCategoryImpl;
import java.io.Serializable; import java.io.Serializable;
import java.util.Calendar; import java.util.Calendar;
@ -57,7 +58,7 @@ public class EntryLink implements Serializable
private final List<EntryComment> comments = new CopyOnWriteArrayList<EntryComment>(); private final List<EntryComment> comments = new CopyOnWriteArrayList<EntryComment>();
// The tags/categories // The tags/categories
private final List<SyndCategoryImpl> tags = new CopyOnWriteArrayList<SyndCategoryImpl>(); private final List<SyndCategory> tags = new CopyOnWriteArrayList<SyndCategory>();
// The channel // The channel
private String channel = ""; private String channel = "";
@ -87,7 +88,8 @@ public class EntryLink implements Serializable
* @param channel The channel. * @param channel The channel.
* @param tags The entry's tags/categories. * @param tags The entry's tags/categories.
*/ */
public EntryLink(final String link, final String title, final String nick, final String login, final String channel, final String tags) public EntryLink(final String link, final String title, final String nick, final String login, final String channel,
final String tags)
{ {
this.link = link; this.link = link;
this.title = title; this.title = title;
@ -163,7 +165,8 @@ public class EntryLink implements Serializable
* @param date The entry date. * @param date The entry date.
* @param tags The entry's tags/categories. * @param tags The entry's tags/categories.
*/ */
public EntryLink(final String link, final String title, final String nick, final String channel, final Date date, final List<SyndCategoryImpl> tags) public EntryLink(final String link, final String title, final String nick, final String channel, final Date date,
final List<SyndCategory> tags)
{ {
this.link = link; this.link = link;
this.title = title; this.title = title;
@ -349,7 +352,7 @@ public class EntryLink implements Serializable
* *
* @return The tags. * @return The tags.
*/ */
public final List getTags() public final List<SyndCategory> getTags()
{ {
return tags; return tags;
} }
@ -359,7 +362,7 @@ public class EntryLink implements Serializable
* *
* @param tags The tags. * @param tags The tags.
*/ */
private void setTags(final List<SyndCategoryImpl> tags) private void setTags(final List<SyndCategory> tags)
{ {
this.tags.addAll(tags); this.tags.addAll(tags);
} }

16
src/main/java/net/thauvin/erik/mobibot/FeedReader.java
View file

@ -31,11 +31,11 @@
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import com.sun.syndication.feed.synd.SyndEntry; import com.rometools.rome.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndEntryImpl; import com.rometools.rome.feed.synd.SyndEntryImpl;
import com.sun.syndication.feed.synd.SyndFeed; import com.rometools.rome.feed.synd.SyndFeed;
import com.sun.syndication.fetcher.FeedFetcher; import com.rometools.rome.io.SyndFeedInput;
import com.sun.syndication.fetcher.impl.HttpURLFeedFetcher; import com.rometools.rome.io.XmlReader;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
@ -94,11 +94,11 @@ class FeedReader implements Runnable
*/ */
public final void run() public final void run()
{ {
final FeedFetcher fetcher = new HttpURLFeedFetcher(bot.getFeedInfoCache());
try try
{ {
final SyndFeed feed = fetcher.retrieveFeed(new URL(url)); final SyndFeedInput input = new SyndFeedInput();
final SyndFeed feed = input.build(new XmlReader(new URL(url)));
SyndEntry item; SyndEntry item;
final List items = feed.getEntries(); final List items = feed.getEntries();

17
src/main/java/net/thauvin/erik/mobibot/Mobibot.java
View file

@ -31,9 +31,7 @@
*/ */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import com.sun.syndication.fetcher.impl.FeedFetcherCache; import com.rometools.rome.io.FeedException;
import com.sun.syndication.fetcher.impl.HashMapFeedInfoCache;
import com.sun.syndication.io.FeedException;
import net.objecthunter.exp4j.Expression; import net.objecthunter.exp4j.Expression;
import net.objecthunter.exp4j.ExpressionBuilder; import net.objecthunter.exp4j.ExpressionBuilder;
import net.thauvin.erik.semver.Version; import net.thauvin.erik.semver.Version;
@ -174,10 +172,6 @@ public class Mobibot extends PircBot
*/ */
private final List<EntryLink> entries = new ArrayList<EntryLink>(0); private final List<EntryLink> entries = new ArrayList<EntryLink>(0);
/**
* The feed info cache.
*/
private final FeedFetcherCache feedInfoCache = HashMapFeedInfoCache.getInstance();
/** /**
* The history/backlogs array. * The history/backlogs array.
@ -943,15 +937,6 @@ public class Mobibot extends PircBot
return channel; return channel;
} }
/**
* Returns the {@link FeedFetcherCache feed info cache}.
*
* @return The feed info cache.
*/
public final FeedFetcherCache getFeedInfoCache()
{
return this.feedInfoCache;
}
/** /**
* Returns the irc server. * Returns the irc server.

2
version.properties
View file

@ -5,4 +5,4 @@ version.major=0
version.minor=6 version.minor=6
version.patch=1 version.patch=1
version.prerelease=beta version.prerelease=beta
version.buildmeta=004 version.buildmeta=005