Merge branch 'maintenance'

TwidereProject · May 12, 2020 · 00dd67f · 00dd67f
2 parents 6de134f + fe9bc2b
commit 00dd67f
Show file tree

Hide file tree

Showing 110 changed files with 307 additions and 3,092 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -61,7 +61,6 @@ after_failure:
 
 deploy:
   - provider: releases
-    prerelease: true
     api_key:
       secure: "S1GSwQPN1ffS1wMmkNwKY7HlZbVysfn3LJa318gKbIB2RdnNoLT6xuZSWhe5mAI41yG45wkUpfK9fah6ueZFEd74+xy4q2aqaJDhhi/xqys/8VkODaNsHMkE2aWqnWqAcRBNRA1j8eFFZDjgge1t2x924U7jDEQaOOHHHQ58lxA="
     file_glob: true

diff --git a/build.gradle b/build.gradle
@@ -17,8 +17,8 @@ buildscript {
 allprojects {
     ext {
         projectGroupId = 'org.mariotaku.twidere'
-        projectVersionCode = 510
-        projectVersionName = '4.1.1'
+        projectVersionCode = 511
+        projectVersionName = '4.1.2'
 
         globalCompileSdkVersion = 29
         globalBuildToolsVersion = "29.0.3"
@@ -53,7 +53,7 @@ subprojects {
                     MapsUtils            : '0.6.2',
                     DropboxCoreSdk       : '3.1.3',
                     GoogleDriveApi       : 'v3-rev193-1.25.0',
-                    Exoplayer            : 'r2.2.0',
+                    Exoplayer            : '2.11.4',
                     Toro                 : '2.1.0',
                     LoganSquare          : '1.3.7',
                     IABv3                : '1.1.0',

diff --git a/...e.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/FanfouStream.java b/...e.component.common/src/main/java/org/mariotaku/microblog/library/fanfou/FanfouStream.java
diff --git a/...c/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java b/...c/main/java/org/mariotaku/microblog/library/fanfou/callback/FanfouUserStreamCallback.java
diff --git a/.../java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java b/.../java/org/mariotaku/microblog/library/fanfou/callback/SimpleFanfouUserStreamCallback.java
diff --git a/...common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java b/...common/src/main/java/org/mariotaku/microblog/library/fanfou/model/FanfouStreamObject.java
diff --git a/...ere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/Mastodon.java b/...ere.component.common/src/main/java/org/mariotaku/microblog/library/mastodon/Mastodon.java
@@ -23,7 +23,6 @@
 import org.mariotaku.microblog.library.mastodon.api.BlocksResources;
 import org.mariotaku.microblog.library.mastodon.api.FavouritesResources;
 import org.mariotaku.microblog.library.mastodon.api.FollowRequestsResources;
-import org.mariotaku.microblog.library.mastodon.api.FollowsResources;
 import org.mariotaku.microblog.library.mastodon.api.InstancesResources;
 import org.mariotaku.microblog.library.mastodon.api.MediaResources;
 import org.mariotaku.microblog.library.mastodon.api.MutesResources;
@@ -37,7 +36,7 @@
  * Created by mariotaku on 2017/4/17.
  */
 public interface Mastodon extends AccountsResources, AppsResources, BlocksResources,
-        FavouritesResources, FollowRequestsResources, FollowsResources, InstancesResources,
+        FavouritesResources, FollowRequestsResources, InstancesResources,
         MediaResources, MutesResources, NotificationsResources, ReportsResources, SearchResources,
         StatusesResources, TimelinesResources {
 

diff --git a/...nent.common/src/main/java/org/mariotaku/microblog/library/mastodon/MastodonStreaming.java b/...nent.common/src/main/java/org/mariotaku/microblog/library/mastodon/MastodonStreaming.java
diff --git a/...t.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowsResources.java b/...t.common/src/main/java/org/mariotaku/microblog/library/mastodon/api/FollowsResources.java