Merge pull request #588 from imashnake0/gradle-cleanup

Gradle cleanup

app/build.gradle

@@ -55,35 +55,34 @@ android {
 }
 
 dependencies {
-    //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
+    //debugImplementation libs.square.leakcanary
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    implementation libs.androidx.appcompat
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation libs.androidx.constraintlayout
-    implementation 'com.google.android.material:material:1.6.0'
+    implementation libs.androidx.legacySupport
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
+    implementation libs.androidx.multidex
-    implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
+    implementation libs.androidx.navigation.fragment
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation libs.androidx.navigation.ui
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation libs.androidx.preference
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation libs.androidx.test.junit
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation libs.androidx.test.espressoCore
 
-    implementation 'com.squareup.picasso:picasso:2.8'
+    implementation libs.circleimageview
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
-    implementation 'com.google.android.exoplayer:extension-mediasession:2.17.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
 
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
+    implementation libs.material
-    implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
+    implementation libs.exoplayer
-    //do not update jackson annotations! it does not supports <api26
+    implementation(libs.exoplayer.extension.cronet) { exclude group: 'com.google.android.gms' }
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.13.3'
+    implementation libs.exoplayer.extension.mediasession
 
-    implementation 'com.arthenica:ffmpeg-kit-min:4.5.1.LTS'
+    implementation libs.square.picasso
+    implementation libs.square.retrofit
+    implementation libs.square.retrofit.converterJackson
+    // Do not update jackson annotations! It does not supports < API 26.
+    implementation libs.jacksonAnnotations
 
+    implementation libs.mobileffmpeg
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring libs.desugaring
-    implementation('com.google.android.exoplayer:extension-cronet:2.17.1') { exclude group: 'com.google.android.gms' }
+    implementation libs.cronet.embedded
-    implementation 'org.chromium.net:cronet-embedded:101.4951.41'
-
 }

build.gradle

@@ -1,3 +1,8 @@
+//plugins {
+  //  id 'com.android.application' apply false version '7.2.1'
+    //id 'org.jetbrains.kotlin.android' apply false version '1.7.0'
+//}
+
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
@@ -15,4 +20,4 @@ buildscript {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
+}

gradle/libs.versions.toml

@@ -0,0 +1,43 @@
+[versions]
+appcompat = "1.4.1"
+constraintlayout = "2.1.3"
+material = "1.6.0"
+navigation = "2.4.2"
+legacySupport = "1.0.0"
+preference = "1.2.0"
+extJunit = "1.1.3"
+espresso = "3.4.0"
+picasso = "2.8"
+circleimageview = "3.1.0"
+exoplayer = "2.17.1"
+multidex = "2.0.1"
+retrofit = "2.9.0"
+jacksonAnnotations = "2.13.3"
+mobileffmpeg = "4.5.1.LTS"
+desugaring = "1.1.5"
+cronetEmbedded = "101.4951.41"
+leakcanary = "2.8.1"
+
+[libraries]
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+androidx-navigation-fragment = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigation" }
+androidx-navigation-ui = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigation" }
+androidx-legacySupport = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupport" }
+androidx-preference = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference" }
+androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "extJunit" }
+androidx-test-espressoCore = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso" }
+square-picasso = { group = "com.squareup.picasso", name = "picasso", version.ref = "picasso" }
+circleimageview = { group = "de.hdodenhof", name = "circleimageview", version.ref = "circleimageview" }
+exoplayer = { group = "com.google.android.exoplayer", name = "exoplayer", version.ref = "exoplayer" }
+exoplayer-extension-mediasession = { group = "com.google.android.exoplayer", name = "extension-mediasession", version.ref = "exoplayer" }
+androidx-multidex = { group = "androidx.multidex", name = "multidex", version.ref = "multidex" }
+square-retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
+square-retrofit-converterJackson = { group = "com.squareup.retrofit2", name = "converter-jackson", version.ref = "retrofit" }
+jacksonAnnotations = { group = "com.fasterxml.jackson.core", name = "jackson-annotations", version.ref = "jacksonAnnotations" }
+mobileffmpeg = { group = "com.arthenica", name = "ffmpeg-kit-min", version.ref = "mobileffmpeg" }
+desugaring = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "desugaring" }
+exoplayer-extension-cronet = { group = "com.google.android.exoplayer", name = "extension-cronet", version.ref = "exoplayer" }
+cronet-embedded = { group = "org.chromium.net", name = "cronet-embedded", version.ref = "cronetEmbedded" }
+square-leakcanary = { group = "com.squareup.leakcanary", name = "leakcanary-android", version.ref = "leakcanary" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Dec 09 16:25:51 GST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -1,3 +1,11 @@
+//pluginManagement {
+  //  repositories {
+        //gradlePluginPortal()
+      //  google()
+    //    mavenCentral()
+  //  }
+//}
+
 dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
@@ -5,5 +13,6 @@ dependencyResolutionManagement {
         mavenCentral()
     }
 }
+
 rootProject.name = "LibreTube"
 include ':app'