Merge pull request #9 from arthur3486/feature/update-dependencies

Update project dependencies
arthur3486 · Jan 22, 2022 · beed5a6 · beed5a6
2 parents f7302f3 + c8f418c
commit beed5a6
Show file tree

Hide file tree

Showing 95 changed files with 219 additions and 583 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 
 **ARVI** will enable you to make your feeds more interactive and appealing to your end users without the need to spend a lot of your valuable time on the implementation.
 
-[ ![Download](https://api.bintray.com/packages/arthurimsacc/maven/arvi/images/download.svg) ](https://bintray.com/arthurimsacc/maven/arvi/_latestVersion)
+[ ![Download](https://img.shields.io/maven-central/v/com.arthurivanets.arvi/arvi.svg?label=Download) ](https://mvnrepository.com/search?q=com.arthurivanets.arvi)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![Platform](https://img.shields.io/badge/platform-Android-green.svg)](http://developer.android.com/index.html)
 ![](https://img.shields.io/badge/API-21%2B-green.svg?style=flat)
@@ -98,7 +98,7 @@ ARVI is comprised of several library modules, namely:
 * `arvi-utils` - common utils and helpers (Optional)
 
 The basic implementation would have to include the core module 
-> ***Latest version:*** [ ![Download](https://api.bintray.com/packages/arthurimsacc/maven/arvi/images/download.svg) ](https://bintray.com/arthurimsacc/maven/arvi/_latestVersion)
+> ***Latest version:*** [ ![Download](https://img.shields.io/maven-central/v/com.arthurivanets.arvi/arvi.svg?label=Download) ](https://mvnrepository.com/search?q=com.arthurivanets.arvi)
 
 `implementation "com.arthurivanets.arvi:arvi:X.Y.Z"`
 
@@ -373,7 +373,7 @@ For more advanced use cases
 
 [Adapster](https://github.com/arthur3486/adapster)-based implementation requires both the official [Adapster](https://github.com/arthur3486/adapster) and `arvi-adapster` module dependencies.
 
-> ***Latest ARVI version:*** [ ![Download](https://api.bintray.com/packages/arthurimsacc/maven/arvi/images/download.svg) ](https://bintray.com/arthurimsacc/maven/arvi/_latestVersion)
+> ***Latest ARVI version:*** [ ![Download](https://img.shields.io/maven-central/v/com.arthurivanets.arvi/arvi.svg?label=Download) ](https://mvnrepository.com/search?q=com.arthurivanets.arvi)
 
 `implementation "com.arthurivanets.arvi:arvi-adapster:X.Y.Z"`
 
@@ -678,7 +678,7 @@ See the [CONTRIBUTING.md](CONTRIBUTING.md) file.
 </table>
 
 
-> Using ARVI in your app and want it to get listed here? Email me at arthur.ivanets.l@gmail.com!
+> Using ARVI in your app and want it to get listed here? Email me at arthur.ivanets.work@gmail.com!
 
 ## License
 

diff --git a/arvi-adapster/build.gradle b/arvi-adapster/build.gradle
@@ -8,8 +8,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdk
         targetSdkVersion rootProject.targetSdk
-        versionCode rootProject.releaseVersionCode
-        versionName rootProject.releaseVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -53,10 +51,10 @@ dependencies {
 }
 
 ext {
-    releaseArtifact = "arvi-adapster"
-    releaseDescription = ""
+    PUBLISH_GROUP_ID = "com.arthurivanets.arvi"
+    PUBLISH_ARTIFACT_ID = "arvi-adapster"
+    PUBLISH_VERSION = "1.3.0"
+    PUBLISH_ARTIFACT_DESCRIPTION = libraryDescription
 }
 
-project.archivesBaseName = "arvi-adapster"
-
 apply from: "../gradle/script/publish.gradle"
diff --git a/...dapster/src/main/java/com/arthurivanets/arvi/adapster/AdapsterPlayableItemViewHolder.java b/...dapster/src/main/java/com/arthurivanets/arvi/adapster/AdapsterPlayableItemViewHolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi-ktx/build.gradle b/arvi-ktx/build.gradle
@@ -10,8 +10,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdk
         targetSdkVersion rootProject.targetSdk
-        versionCode rootProject.releaseVersionCode
-        versionName rootProject.releaseVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -51,11 +49,10 @@ dependencies {
 }
 
 ext {
-    releaseArtifact = "arvi-ktx"
-    releaseDescription = ""
+    PUBLISH_GROUP_ID = "com.arthurivanets.arvi"
+    PUBLISH_ARTIFACT_ID = "arvi-ktx"
+    PUBLISH_VERSION = "1.3.0"
+    PUBLISH_ARTIFACT_DESCRIPTION = libraryDescription
 }
 
-project.archivesBaseName = "arvi-ktx"
-
-apply from: "../common/constants.gradle"
 apply from: '../gradle/script/publish.gradle'
diff --git a/arvi-ktx/src/main/java/com/arthurivanets/arvi/ktx/ArviExtensions.kt b/arvi-ktx/src/main/java/com/arthurivanets/arvi/ktx/ArviExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi-utils/build.gradle b/arvi-utils/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdk
         targetSdkVersion rootProject.targetSdk
-        versionCode rootProject.releaseVersionCode
-        versionName rootProject.releaseVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -41,11 +39,10 @@ dependencies {
 }
 
 ext {
-    releaseArtifact = "arvi-utils"
-    releaseDescription = ""
+    PUBLISH_GROUP_ID = "com.arthurivanets.arvi"
+    PUBLISH_ARTIFACT_ID = "arvi-utils"
+    PUBLISH_VERSION = "1.3.0"
+    PUBLISH_ARTIFACT_DESCRIPTION = libraryDescription
 }
 
-project.archivesBaseName = "arvi-utils"
-
-apply from: "../common/constants.gradle"
-apply from: '../gradle/script/publish.gradle'
+apply from: '../gradle/script/publish.gradle'
diff --git a/arvi-utils/src/main/java/com/arthurivanets/arvi/utils/recyclerview/HasPreCachingSupport.java b/arvi-utils/src/main/java/com/arthurivanets/arvi/utils/recyclerview/HasPreCachingSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ls/src/main/java/com/arthurivanets/arvi/utils/recyclerview/PreCacheGridLayoutManager.java b/...ls/src/main/java/com/arthurivanets/arvi/utils/recyclerview/PreCacheGridLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../src/main/java/com/arthurivanets/arvi/utils/recyclerview/PreCacheLinearLayoutManager.java b/.../src/main/java/com/arthurivanets/arvi/utils/recyclerview/PreCacheLinearLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/build.gradle b/arvi/build.gradle
@@ -6,8 +6,6 @@ android {
     defaultConfig {
         minSdkVersion rootProject.minSdk
         targetSdkVersion rootProject.targetSdk
-        versionCode rootProject.releaseVersionCode
-        versionName rootProject.releaseVersion
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -48,11 +46,10 @@ dependencies {
 }
 
 ext {
-    releaseArtifact = "arvi"
-    releaseDescription = ""
+    PUBLISH_GROUP_ID = "com.arthurivanets.arvi"
+    PUBLISH_ARTIFACT_ID = "arvi"
+    PUBLISH_VERSION = "1.3.0"
+    PUBLISH_ARTIFACT_DESCRIPTION = libraryDescription
 }
 
-project.archivesBaseName = "arvi"
-
-apply from: "../common/constants.gradle"
-apply from: '../gradle/script/publish.gradle'
+apply from: '../gradle/script/publish.gradle'
diff --git a/arvi/src/main/java/com/arthurivanets/arvi/ArviPlayerNodePool.java b/arvi/src/main/java/com/arthurivanets/arvi/ArviPlayerNodePool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/ArviPlugins.java b/arvi/src/main/java/com/arthurivanets/arvi/ArviPlugins.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/Config.java b/arvi/src/main/java/com/arthurivanets/arvi/Config.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,10 @@
 import com.google.android.exoplayer2.DefaultLoadControl;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.LoadControl;
-import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 
-import java.util.Arrays;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -45,7 +42,6 @@ public final class Config {
     @NonNull public final BaseMeter<?, ?> meter;
     @NonNull public final LoadControl loadControl;
     @NonNull public final MediaSourceBuilder mediaSourceBuilder;
-    @NonNull public final DrmSessionManager[] drmSessionManagers;
 
     @Nullable public final Cache cache;
     @Nullable public final DataSource.Factory dataSourceFactory;
@@ -58,7 +54,6 @@ private Config(Builder builder) {
         this.meter = builder.meter;
         this.loadControl = builder.loadControl;
         this.mediaSourceBuilder = builder.mediaSourceBuilder;
-        this.drmSessionManagers = builder.drmSessionManagers;
         this.cache = builder.cache;
         this.dataSourceFactory = builder.dataSourceFactory;
     }
@@ -86,16 +81,6 @@ public final boolean hasDataSourceFactory() {
 
 
 
-    /**
-     * Determines if the {@link DrmSessionManager}s are set.
-     */
-    public final boolean hasDrmSessionManagers() {
-        return (this.drmSessionManagers.length > 0);
-    }
-
-
-
-
     @Override
     public final int hashCode() {
         final int prime = 31;
@@ -106,7 +91,6 @@ public final int hashCode() {
         result = ((prime * result) + this.mediaSourceBuilder.hashCode());
         result = ((prime * result) + (hasCache() ? this.cache.hashCode() : 0));
         result = ((prime * result) + (hasDataSourceFactory() ? this.dataSourceFactory.hashCode() : 0));
-        result = ((prime * result) + (hasDrmSessionManagers() ? Arrays.hashCode(this.drmSessionManagers) : 0));
 
         return result;
     }
@@ -131,7 +115,6 @@ public static final class Builder {
         private BaseMeter<?, ?> meter;
         private LoadControl loadControl;
         private MediaSourceBuilder mediaSourceBuilder;
-        private DrmSessionManager[] drmSessionManagers;
 
         private Cache cache;
         private DataSource.Factory dataSourceFactory;
@@ -142,7 +125,6 @@ public Builder() {
             this.meter = new BaseMeter<>(bandwidthMeter, bandwidthMeter);
             this.loadControl = new DefaultLoadControl();
             this.mediaSourceBuilder = MediaSourceBuilder.DEFAULT;
-            this.drmSessionManagers = new DrmSessionManager[0];
             this.cache = null;
             this.dataSourceFactory = null;
         }
@@ -177,12 +159,6 @@ public Builder looping(boolean isLooping) {
         }
 
 
-        public Builder drmSessionManagers(@NonNull DrmSessionManager[] drmSessionManagers) {
-            this.drmSessionManagers = checkNonNull(drmSessionManagers);
-            return this;
-        }
-
-
         public Builder cache(@Nullable Cache cache) {
             this.cache = cache;
             return this;

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/DefaultPlayerCreatorFactory.java b/arvi/src/main/java/com/arthurivanets/arvi/DefaultPlayerCreatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/DefaultPlayerNodePoolFactory.java b/arvi/src/main/java/com/arthurivanets/arvi/DefaultPlayerNodePoolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/PlayerCreatorFactory.java b/arvi/src/main/java/com/arthurivanets/arvi/PlayerCreatorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/PlayerNode.java b/arvi/src/main/java/com/arthurivanets/arvi/PlayerNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/PlayerNodePool.java b/arvi/src/main/java/com/arthurivanets/arvi/PlayerNodePool.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/PlayerNodePoolFactory.java b/arvi/src/main/java/com/arthurivanets/arvi/PlayerNodePoolFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/PlayerProvider.java b/arvi/src/main/java/com/arthurivanets/arvi/PlayerProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/PlayerProviderImpl.java b/arvi/src/main/java/com/arthurivanets/arvi/PlayerProviderImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/model/PlaybackInfo.java b/arvi/src/main/java/com/arthurivanets/arvi/model/PlaybackInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/arvi/src/main/java/com/arthurivanets/arvi/model/VolumeInfo.java b/arvi/src/main/java/com/arthurivanets/arvi/model/VolumeInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Arthur Ivanets, arthur.ivanets.l@gmail.com
+ * Copyright 2017 Arthur Ivanets, arthur.ivanets.work@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.