Merge pull request #718 from rubenlagus/dev

Update 4.6
rubenlagus · Jan 23, 2020 · bd5c5a2 · bd5c5a2
2 parents 32be70c + 00f6895
commit bd5c5a2
Show file tree

Hide file tree

Showing 25 changed files with 480 additions and 76 deletions.
diff --git a/Bots.ipr b/Bots.ipr
@@ -22,10 +22,10 @@
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
-        <module name="telegrambots-abilities" />
-        <module name="telegrambots-extensions" />
         <module name="telegrambots-meta" />
+        <module name="telegrambots-extensions" />
         <module name="telegrambots" />
+        <module name="telegrambots-abilities" />
         <module name="telegrambots-chat-session-bot" />
         <module name="telegrambots-spring-boot-starter" />
       </profile>
@@ -2021,6 +2021,19 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots-meta/4.2/telegrambots-meta-4.2-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: org.telegram:telegrambots-meta:4.5">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots-meta/4.5/telegrambots-meta-4.5.jar!/" />
+      </CLASSES>
+      <JAVADOC>
+        <root url="jar://$PROJECT_DIR$/telegrambots-meta/telegrambots-meta-4.5-javadoc.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots-meta/4.5/telegrambots-meta-4.5-javadoc.jar!/" />
+      </JAVADOC>
+      <SOURCES>
+        <root url="jar://$PROJECT_DIR$/telegrambots-meta/telegrambots-meta-4.5-sources.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots-meta/4.5/telegrambots-meta-4.5-sources.jar!/" />
+      </SOURCES>
+    </library>
     <library name="Maven: org.telegram:telegrambots:3.5">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/org/telegram/telegrambots/3.5/telegrambots-3.5.jar!/" />

diff --git a/README.md b/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>4.5</version>
+        <version>4.6</version>
     </dependency>
 ```
 
 ```gradle
-    compile "org.telegram:telegrambots:4.5"
+    compile "org.telegram:telegrambots:4.6"
 ```
 
-  2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/4.5)
-  3. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/4.5)
+  2. Using Jitpack from [here](https://jitpack.io/#rubenlagus/TelegramBots/4.6)
+  3. Download the jar(including all dependencies) from [here](https://mvnrepository.com/artifact/org.telegram/telegrambots/4.6)
 
 In order to use Long Polling mode, just create your own bot extending `org.telegram.telegrambots.bots.TelegramLongPollingBot`.
 

diff --git a/TelegramBots.wiki/Changelog.md b/TelegramBots.wiki/Changelog.md
@@ -1,3 +1,6 @@
+### <a id="4.6"></a>4.6 ###
+1. Update Api version [4.6](https://core.telegram.org/bots/api-changelog#january-23-2020)
+
 ### <a id="4.5"></a>4.5 ###
 1. Update Api version [4.5](https://core.telegram.org/bots/api-changelog#december-31-2019)
 2. Fixes: #697, #710

diff --git a/TelegramBots.wiki/Getting-Started.md b/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>4.5</version>
+              <version>4.6</version>
            </dependency>
         ```
     * With **Gradle**:
 
         ```groovy
-          compile group: 'org.telegram', name: 'telegrambots', version: '4.5'
+          compile group: 'org.telegram', name: 'telegrambots', version: '4.6'
         ```
 
 2. Don't like **Maven Central Repository**? It can also be taken from [Jitpack](https://jitpack.io/#rubenlagus/TelegramBots).

diff --git a/TelegramBots.wiki/abilities/Simple-Example.md b/TelegramBots.wiki/abilities/Simple-Example.md
@@ -9,7 +9,7 @@ As with any Java project, you will need to set your dependencies.
    <dependency>
       <groupId>org.telegram</groupId>
       <artifactId>telegrambots-abilities</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
    </dependency>
 ```
 * **Gradle**

diff --git a/TelegramBots.wiki/abilities/State-Machines.md b/TelegramBots.wiki/abilities/State-Machines.md
@@ -63,12 +63,10 @@ Reply saidLeft = Reply.of(upd -> silent.send("Sir, I have gone left.", getChatId
           hasMessageWith("go left or else"));
 ```
 Now, after your naughty bot retaliates, the user can say "go left or else" to force the bot to go left. Awesome, our logic now looks like this:
-<div align="center">
 
-![Alt text](./img/replyflow_diagram.svg)
-<img src="./img/replyflow_diagram.svg">
-
-</div>
+<p align="center">
+  [[/abilities/img/replyflow_diagram.svg|Diagram]]
+</p>
 
 ## Complete Example
 ```java

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.telegram</groupId>
     <artifactId>Bots</artifactId>
     <packaging>pom</packaging>
-    <version>4.5</version>
+    <version>4.6</version>
 
     <modules>
         <module>telegrambots</module>

diff --git a/telegrambots-abilities/README.md b/telegrambots-abilities/README.md
@@ -18,19 +18,19 @@ Usage
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots-abilities</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
     </dependency>
 ```
 
 **Gradle**
 
 ```gradle
-    compile "org.telegram:telegrambots-abilities:4.5"
+    compile "org.telegram:telegrambots-abilities:4.6"
 ```
 
-**JitPack** - [JitPack](https://jitpack.io/#rubenlagus/TelegramBots/v4.5)
+**JitPack** - [JitPack](https://jitpack.io/#rubenlagus/TelegramBots/v4.6)
 
-**Plain imports** - [Here](https://github.com/rubenlagus/TelegramBots/releases/tag/v4.5)
+**Plain imports** - [Here](https://github.com/rubenlagus/TelegramBots/releases/tag/v4.6)
 
 Motivation
 ----------

diff --git a/telegrambots-abilities/pom.xml b/telegrambots-abilities/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
     </parent>
 
     <artifactId>telegrambots-abilities</artifactId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>4.5</version>
+            <version>4.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/telegrambots-chat-session-bot/README.md b/telegrambots-chat-session-bot/README.md
@@ -15,7 +15,7 @@ Usage
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambots-chat-session-bot</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
     </dependency>
 ```
 

diff --git a/telegrambots-chat-session-bot/pom.xml b/telegrambots-chat-session-bot/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
     </parent>
 
     <artifactId>telegrambots-chat-session-bot</artifactId>
@@ -84,7 +84,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>4.5</version>
+            <version>4.6</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.apache.shiro/shiro-core -->

diff --git a/telegrambots-extensions/README.md b/telegrambots-extensions/README.md
@@ -16,12 +16,12 @@ Just import add the library to your project with one of these options:
     <dependency>
         <groupId>org.telegram</groupId>
         <artifactId>telegrambotsextensions</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
     </dependency>
 ```
 
    2. Using Gradle:
 
 ```gradle
-    compile "org.telegram:telegrambotsextensions:4.5"
+    compile "org.telegram:telegrambotsextensions:4.6"
 ```
diff --git a/telegrambots-extensions/pom.xml b/telegrambots-extensions/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
     </parent>
 
     <artifactId>telegrambotsextensions</artifactId>
@@ -75,7 +75,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>4.5</version>
+            <version>4.6</version>
         </dependency>
     </dependencies>
 

diff --git a/telegrambots-meta/pom.xml b/telegrambots-meta/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.telegram</groupId>
         <artifactId>Bots</artifactId>
-        <version>4.5</version>
+        <version>4.6</version>
     </parent>
 
     <artifactId>telegrambots-meta</artifactId>