Merge pull request #248 from kosharskiy/gradle_file_cleanup

cleanup app/build.gradle file

app/build.gradle

@@ -33,6 +33,8 @@ else {
 
 android {
     compileSdkVersion 29
+    buildToolsVersion "29.0.3"
+
     defaultConfig {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
@@ -41,11 +43,7 @@ android {
         versionName System.getenv("VERSION_NAME") + "-" + System.getenv("VERSION_SHA")
         buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        ext {
+
-            libVersions = [
-                    exoplayer: '2.11.6'
-            ]
-        }
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments = [
@@ -54,58 +52,6 @@ android {
                         "room.expandProjection": "true"]
             }
         }
-        dependencies {
-            implementation fileTree(dir: 'libs', include: ['*.jar'])
-
-            // Layouts and design
-            implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-            implementation 'androidx.appcompat:appcompat:1.2.0'
-            implementation 'androidx.cardview:cardview:1.0.0'
-            implementation 'androidx.recyclerview:recyclerview:1.1.0'
-            implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-            implementation 'com.google.android.material:material:1.2.0'
-            implementation 'de.hdodenhof:circleimageview:3.0.0'
-
-            // font awesome
-            implementation "com.mikepenz:iconics-core:3.1.0"
-            implementation 'com.mikepenz:fontawesome-typeface:5.3.1.1@aar'
-
-            // http client / REST
-            implementation 'com.squareup.okhttp3:okhttp:4.8.0'
-            implementation 'com.squareup.retrofit2:retrofit:2.5.0'
-
-            // image downloading and caching library
-            implementation 'com.squareup.picasso:picasso:2.71828'
-
-            // json decoder/encoder
-            implementation 'com.google.code.gson:gson:2.8.6'
-            implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-
-            // Torrents and WebRTC
-            implementation 'com.github.TorrentStream:TorrentStream-Android:2.6.1'
-//            implementation "com.github.TorrentStream:TorrentStreamServer-Android:1.0.1"
-//            implementation 'org.webrtc:google-webrtc:1.0.+'
-
-            // video player  repo:jcenter()
-            implementation "com.google.android.exoplayer:exoplayer-core:$libVersions.exoplayer"
-            implementation "com.google.android.exoplayer:exoplayer-dash:$libVersions.exoplayer"
-            implementation "com.google.android.exoplayer:exoplayer-ui:$libVersions.exoplayer"
-            implementation "com.google.android.exoplayer:exoplayer-hls:$libVersions.exoplayer"
-            implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$libVersions.exoplayer"
-            implementation "com.google.android.exoplayer:extension-mediasession:$libVersions.exoplayer"
-            implementation "com.google.android.exoplayer:extension-okhttp:$libVersions.exoplayer"
-
-            // date formatter
-            implementation 'org.ocpsoft.prettytime:prettytime:4.0.4.Final'
-
-            // Version comparison
-            implementation 'org.apache.maven:maven-artifact:3.5.0'
-
-            // testing
-            testImplementation 'junit:junit:4.13'
-            androidTestImplementation 'androidx.test:runner:1.3.0'
-            androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-        }
     }
     signingConfigs {
         release {
@@ -136,26 +82,70 @@ android {
     }
 }
 
+def room_version = "2.2.6"
+def lifecycleVersion = '2.2.0'
+def exoplayer = '2.12.3'
+
 dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    def room_version = "2.2.5"
+    // Layouts and design
-    def archLifecycleVersion = '2.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'com.google.android.material:material:1.2.0'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+
+    implementation 'de.hdodenhof:circleimageview:3.0.0'
+
+    // font awesome
+    implementation "com.mikepenz:iconics-core:3.1.0"
+    implementation 'com.mikepenz:fontawesome-typeface:5.3.1.1@aar'
+
+    // http client / REST
+    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+
+    // image downloading and caching library
+    implementation 'com.squareup.picasso:picasso:2.71828'
+
+    // json decoder/encoder
+    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+
+    // Torrents and WebRTC
+    implementation 'com.github.TorrentStream:TorrentStream-Android:2.7.0'
+//            implementation "com.github.TorrentStream:TorrentStreamServer-Android:1.0.1"
+//            implementation 'org.webrtc:google-webrtc:1.0.+'
+
+    // video player  repo:jcenter()
+    implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer"
+    implementation "com.google.android.exoplayer:exoplayer-dash:$exoplayer"
+    implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer"
+    implementation "com.google.android.exoplayer:exoplayer-hls:$exoplayer"
+    implementation "com.google.android.exoplayer:exoplayer-smoothstreaming:$exoplayer"
+    implementation "com.google.android.exoplayer:extension-mediasession:$exoplayer"
+    implementation "com.google.android.exoplayer:extension-okhttp:$exoplayer"
+
+    // date formatter
+    implementation 'org.ocpsoft.prettytime:prettytime:4.0.4.Final'
+
+    // Version comparison
+    implementation 'org.apache.maven:maven-artifact:3.5.0'
 
     // database lib
     implementation "androidx.room:room-runtime:$room_version"
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     annotationProcessor "androidx.room:room-compiler:$room_version"
     androidTestImplementation "androidx.room:room-testing:$room_version"
 
     // Lifecycle components
-    implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
-    annotationProcessor "androidx.lifecycle:lifecycle-common-java8:$archLifecycleVersion"
+    annotationProcessor "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
 
     implementation 'androidx.preference:preference:1.1.1'
+
+    // testing
+    testImplementation 'junit:junit:4.13'
+    androidTestImplementation 'androidx.test:runner:1.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Nov 22 12:39:32 CET 2020
+#Wed Jan 13 22:22:53 EET 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip