Gson 2.9.1, OkHttp 4.10.0. Fix tests

Author: pengrad

library/build.gradle

@@ -5,9 +5,9 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 dependencies {
-    compile 'com.google.code.gson:gson:2.8.9'
-    compile 'com.squareup.okhttp3:okhttp:4.9.3'
-    compile 'com.squareup.okhttp3:logging-interceptor:4.9.3'
+    compile 'com.google.code.gson:gson:2.9.1'
+    compile 'com.squareup.okhttp3:okhttp:4.10.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:4.10.0'
 
     testCompile 'junit:junit:4.13.1'
     testCompile 'nl.jqno.equalsverifier:equalsverifier:3.1.13'

library/src/main/java/com/pengrad/telegrambot/model/StickerSet.java

@@ -68,6 +68,7 @@ public boolean equals(Object o) {
                 Objects.equals(sticker_type, that.sticker_type) &&
                 Objects.equals(is_animated, that.is_animated) &&
                 Objects.equals(is_video, that.is_video) &&
+                Objects.equals(contains_masks, that.contains_masks) &&
                 Arrays.equals(stickers, that.stickers) &&
                 Objects.equals(thumb, that.thumb);
     }
@@ -87,6 +88,7 @@ public String toString() {
                 ", sticker_type='" + sticker_type + '\'' +
                 ", is_animated=" + is_animated +
                 ", is_video=" + is_video +
+                ", contains_masks=" + contains_masks +
                 ", stickers=" + Arrays.toString(stickers) +
                 ", thumb=" + thumb +
                 '}';

library/src/main/java/com/pengrad/telegrambot/request/CreateNewStickerSet.java

@@ -47,7 +47,7 @@ public CreateNewStickerSet containsMasks(boolean containsMasks) {
     }
 
     public CreateNewStickerSet maskPosition(MaskPosition maskPosition) {
-        return add("mask_position", maskPosition).containsMasks(true);
+        return add("mask_position", maskPosition);
     }
 
     /**

library/src/test/java/com/pengrad/telegrambot/TelegramBotTest.java

@@ -1313,6 +1313,7 @@ public void getStickerSet() {
             StickerTest.check(sticker, true, true);
         }
         assertTrue(stickerSet.containsMasks());
+        assertEquals(stickerSet.stickerType(), Sticker.Type.mask);
         assertEquals(TelegramBotTest.stickerSet, stickerSet.name());
         assertEquals("test1", stickerSet.title());
         assertFalse(stickerSet.isAnimated());
@@ -1338,7 +1339,7 @@ public void createNewPngStickerSet() {
         BaseResponse response = bot.execute(
                 CreateNewStickerSet.pngSticker(chatId, "test" + System.currentTimeMillis() + "_by_pengrad_test_bot",
                                 "test1", "\uD83D\uDE00", stickerFile)
-                        .containsMasks(true)
+                        .stickerType(Sticker.Type.mask)
                         .maskPosition(new MaskPosition(MaskPosition.Point.forehead, 0f, 0f, 1f)));
         assertTrue(response.isOk());
     }
@@ -1349,7 +1350,7 @@ public void createNewWebmStickerSetAndAddSticker() {
         BaseResponse response = bot.execute(
                 CreateNewStickerSet.webmSticker(chatId, setName,
                                 "test1", "\uD83D\uDE00", stickerFileVid)
-                        .containsMasks(true)
+                        .stickerType(Sticker.Type.mask)
                         .maskPosition(new MaskPosition(MaskPosition.Point.forehead, 0f, 0f, 1f)));
         assertTrue(response.isOk());
 

pom.xml

@@ -30,19 +30,19 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <version>2.9.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.9.3</version>
+      <version>4.10.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>logging-interceptor</artifactId>
-      <version>4.9.3</version>
+      <version>4.10.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>