chore(dependencies): clean dependencies

ThibaultBee · Jul 17, 2024 · f73059f · f73059f
1 parent 466a0f7
commit f73059f
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 44 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,9 +4,9 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial
 import java.net.URL
 
 plugins {
-    alias(libs.plugins.androidApplication).apply(false)
-    alias(libs.plugins.jetbrainsKotlinAndroid).apply(false)
-    alias(libs.plugins.androidLibrary).apply(false)
+    alias(libs.plugins.android.application).apply(false)
+    alias(libs.plugins.kotlin.android).apply(false)
+    alias(libs.plugins.android.library).apply(false)
     alias(libs.plugins.dokka)
 }
 

diff --git a/example/build.gradle.kts b/example/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    alias(libs.plugins.jetbrainsKotlinAndroid)
-    alias(libs.plugins.androidApplication)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.android.application)
 }
 
 android {
@@ -35,25 +35,22 @@ android {
     buildFeatures {
         viewBinding = true
     }
-
-    namespace = "io.github.thibaultbee.srtdroid.example"
 }
 
 dependencies {
     implementation(project(":srtdroid-ktx"))
-    implementation(libs.kotlin.stdlib.jdk7)
-    implementation(libs.appcompat)
-    implementation(libs.core.ktx)
-    implementation(libs.constraintlayout)
-    implementation(libs.multidex)
-    implementation(libs.preference.ktx)
-    implementation(libs.navigation.fragment.ktx)
-    implementation(libs.navigation.ui.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.multidex)
+    implementation(libs.androidx.preference.ktx)
+    implementation(libs.androidx.navigation.fragment.ktx)
+    implementation(libs.androidx.navigation.ui.ktx)
     implementation(libs.guava)
 
     testImplementation(libs.junit)
 
-    androidTestImplementation(libs.ext.junit)
-    androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -15,24 +15,23 @@ preferenceKtx = "1.2.1"
 runner = "1.6.1"
 
 [libraries]
-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
-ext-junit = { module = "androidx.test.ext:junit", version.ref = "androidxJunit" }
+androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
+androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCore" }
+androidx-junit = { module = "androidx.test.ext:junit", version.ref = "androidxJunit" }
+androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
+androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
+androidx-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" }
+androidx-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
+androidx-rules = { module = "androidx.test:rules", version.ref = "runner" }
+androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 junit = { module = "junit:junit", version.ref = "junit" }
-kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk7", version.ref = "kotlin" }
-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
-navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigationFragmentKtx" }
-preference-ktx = { module = "androidx.preference:preference-ktx", version.ref = "preferenceKtx" }
-rules = { module = "androidx.test:rules", version.ref = "runner" }
-runner = { module = "androidx.test:runner", version.ref = "runner" }
 
 [plugins]
-androidApplication = { id = "com.android.application", version.ref = "agp" }
-jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-androidLibrary = { id = "com.android.library", version.ref = "agp" }
+android-application = { id = "com.android.application", version.ref = "agp" }
+android-library = { id = "com.android.library", version.ref = "agp" }
+kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 
diff --git a/srtdroid-core/build.gradle.kts b/srtdroid-core/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    alias(libs.plugins.jetbrainsKotlinAndroid)
-    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.android.library)
 }
 
 description = "Secure Reliable Transport (SRT) Protocol for Android"
@@ -47,14 +47,13 @@ android {
 }
 
 dependencies {
-    implementation(libs.kotlin.stdlib.jdk7)
-    implementation(libs.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
     testImplementation(libs.junit)
 
     androidTestImplementation(libs.junit)
-    androidTestImplementation(libs.runner)
-    androidTestImplementation(libs.rules)
-    androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.androidx.runner)
+    androidTestImplementation(libs.androidx.rules)
+    androidTestImplementation(libs.androidx.espresso.core)
     androidTestImplementation(libs.guava)
 }
diff --git a/srtdroid-ktx/build.gradle.kts b/srtdroid-ktx/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
-    alias(libs.plugins.jetbrainsKotlinAndroid)
-    alias(libs.plugins.androidLibrary)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.android.library)
 }
 
 description = "Secure Reliable Transport (SRT) Protocol with Kotlin coroutines for Android"
@@ -43,11 +43,11 @@ android {
 dependencies {
     api(project(":srtdroid-core"))
 
-    implementation(libs.core.ktx)
+    implementation(libs.androidx.core.ktx)
 
     testImplementation(libs.junit)
 
-    androidTestImplementation(libs.ext.junit)
-    androidTestImplementation(libs.espresso.core)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
 }