Merge pull request rubenlagus#253 from rubenlagus/dev

Version 3.0.2

Bots.ipr

@@ -17,6 +17,7 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="telegrambots" />
+        <module name="telegrambots-extensions" />
         <module name="telegrambots-meta" />
       </profile>
       <profile name="Annotation profile for Bots" enabled="true">
@@ -29,11 +30,13 @@
     <bytecodeTargetLevel>
       <module name="Bots" target="1.5" />
       <module name="telegrambots" target="1.8" />
+      <module name="telegrambots-extensions" target="1.8" />
       <module name="telegrambots-meta" target="1.8" />
     </bytecodeTargetLevel>
   </component>
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$/telegrambots" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/telegrambots-extensions" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/telegrambots-meta" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
@@ -261,6 +264,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/Bots.iml" filepath="$PROJECT_DIR$/Bots.iml" />
       <module fileurl="file://$PROJECT_DIR$/telegrambots/telegrambots.iml" filepath="$PROJECT_DIR$/telegrambots/telegrambots.iml" />
+      <module fileurl="file://$PROJECT_DIR$/telegrambots-extensions/telegrambots-extensions.iml" filepath="$PROJECT_DIR$/telegrambots-extensions/telegrambots-extensions.iml" />
       <module fileurl="file://$PROJECT_DIR$/telegrambots-meta/telegrambots-meta.iml" filepath="$PROJECT_DIR$/telegrambots-meta/telegrambots-meta.iml" />
     </modules>
   </component>
@@ -834,6 +838,28 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/mockito/mockito-all/2.0.2-beta/mockito-all-2.0.2-beta-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: org.telegram:telegrambots-meta:3.0.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots-meta/3.0.1/telegrambots-meta-3.0.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots-meta/3.0.1/telegrambots-meta-3.0.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots-meta/3.0.1/telegrambots-meta-3.0.1-sources.jar!/" />
+      </SOURCES>
+    </library>
+    <library name="Maven: org.telegram:telegrambots:3.0.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots/3.0.1/telegrambots-3.0.1.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots/3.0.1/telegrambots-3.0.1-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots/3.0.1/telegrambots-3.0.1-sources.jar!/" />
+      </SOURCES>
+    </library>
   </component>
   <component name="masterDetails">
     <states>

README.md

@@ -27,16 +27,16 @@ Just import add the library to your project with one of these options:
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots</artifactId>
-        <version>3.0.1</version>
+        <version>3.0.2</version>
     </dependency>
 ```
 
 ```gradle
-    compile "org.telegram:telegrambots:3.0.1"
+    compile "org.telegram:telegrambots:3.0.2"
 ```
 
-  2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/3.0.1)
-  3. Download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/3.0.1)
+  2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/3.0.2)
+  3. Download the jar(including all dependencies) from [here](https://github.com/rubenlagus/TelegramBots/releases/tag/3.0.2)
 
 In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`.
 

TelegramBots.wiki/Changelog.md

@@ -58,4 +58,12 @@
 ### <a id="3.0.1"></a>3.0.1 ###
 1. Added `getLevel` to `BotLogger` class.
 2. Fix wrong URL when setting webhook
-3. Bug Fixing: #244, #233
+3. Bug Fixing: #244, #233
+
+### <a id="3.0.2"></a>3.0.2 ###
+1. Bug Fixing: #250
+2. Added new module `telegrambots-extensions` that should contains any extensions of the API such as CommandBot or TimedBot.
+3. `TelegramLongPollingCommandBot` receives now the bot username as constructor parameters, all deprecated constructors will be removed in next mayor release.
+4. `getUsername` method from `TelegramLongPollingCommandBot` can be considered `final` and will be so in next mayor release.
+
+**[[How to update to version 3.0.2|How-To-Update#3.0.2]]**

TelegramBots.wiki/Getting-Started.md

@@ -11,13 +11,13 @@ First you need ot get the library and add it to your project. There are few poss
            <dependency>
               <groupId>org.telegram</groupId>
               <artifactId>telegrambots</artifactId>
-              <version>3.0.1</version>
+              <version>3.0.2</version>
            </dependency>
         ```
     * With **Gradle**:
 
         ```groovy
-          compile group: 'org.telegram', name: 'telegrambots', version: '3.0.1'
+          compile group: 'org.telegram', name: 'telegrambots', version: '3.0.2'
         ```
 
 2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots).

TelegramBots.wiki/How-To-Update.md

@@ -23,4 +23,8 @@
 2. In `editMessageTextAsync`, `editMessageCaptionAsync` or `editMessageReplyMarkupAsync` in `AbsSender`, second parameter should become `SentCallback<Serializable>` due to new return type. 
 
 ### <a id="3.0"></a>To version 3.0 ###
-1. In `Message` object, field `new_chat_member` was replaced by `new_chat_members` that is now an array of users.
+1. In `Message` object, field `new_chat_member` was replaced by `new_chat_members` that is now an array of users.
+
+### <a id="3.0.2"></a>To version 3.0.2 ###
+1. If you were using `TelegramLongPollingCommandBot`, add the new [extensions dependency](https://github.com/rubenlagus/TelegramBots/tree/master/telegrambots-extensions) to your maven and fix import statements in your project.
+2. If you were using `TelegramLongPollingCommandBot`, make sure you start using constructors with username and prevent overriding `getUsername` method.

pom.xml

@@ -7,11 +7,12 @@
     <groupId>org.telegram</groupId>
     <artifactId>Bots</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.1</version>
+    <version>3.0.2</version>
 
     <modules>
         <module>telegrambots</module>
         <module>telegrambots-meta</module>
+        <module>telegrambots-extensions</module>
     </modules>
 
     <licenses>
@@ -24,6 +25,6 @@
 
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
-        <bots.version>3.0.1</bots.version>
+        <bots.version>3.0.2</bots.version>
     </properties>
 </project>

telegrambots-extensions/README.md

@@ -0,0 +1,27 @@
+# Telegram Bot Extensions
+
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.telegram/telegrambotsextensions/badge.svg)](http://mvnrepository.com/artifact/org.telegram/telegrambotsextensions)
+[![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/rubenlagus/TelegramBots/blob/master/LICENSE)
+
+Extensions to default bots implementation of Telegram Bots library
+
+
+## Usage
+
+Just import add the library to your project with one of these options:
+
+  1. Using Maven Central Repository:
+
+```xml
+    <dependency>
+        <groupId>org.telegram</groupId>
+        <artifactId>telegrambotsextensions</artifactId>
+        <version>3.0.2</version>
+    </dependency>
+```
+
+   2. Using Gradle:
+
+```gradle
+    compile "org.telegram:telegrambotsextensions:3.0.2"
+```