diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bbb3595a6..cf62e9ab3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,9 +7,9 @@ plugins { kotlin("android") kotlin("kapt") id("kotlin-parcelize") - id(Plugins.detekt) version Plugins.Versions.detekt - id(Plugins.androidJunit5) - id(Plugins.dependencyUpdates) version Plugins.Versions.dependencyUpdates + alias(libs.plugins.detekt) + id("de.mannodermaus.android-junit5") + alias(libs.plugins.dependencyupdates) } detekt { diff --git a/build.gradle.kts b/build.gradle.kts index d5629a272..28ea548ba 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { } dependencies { val kotlinVersion: String by project - classpath("com.android.tools.build:gradle:7.0.1") + classpath("com.android.tools.build:gradle:7.0.2") classpath(kotlin("gradle-plugin", kotlinVersion)) classpath("de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1") } diff --git a/buildSrc/src/main/kotlin/Plugins.kt b/buildSrc/src/main/kotlin/Plugins.kt deleted file mode 100644 index a28f3acec..000000000 --- a/buildSrc/src/main/kotlin/Plugins.kt +++ /dev/null @@ -1,10 +0,0 @@ -object Plugins { - object Versions { - const val dependencyUpdates = "0.39.0" - const val detekt = "1.17.1" - } - - const val detekt = "io.gitlab.arturbosch.detekt" - const val androidJunit5 = "de.mannodermaus.android-junit5" - const val dependencyUpdates = "com.github.ben-manes.versions" -} diff --git a/gradle.properties b/gradle.properties index cfe641c1e..3cbd0b1a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official # Kotlin version for this project -kotlinVersion=1.5.21 +kotlinVersion=1.5.30 # Allow using snapshot releases of Jellyfin SDK. Possible values are: # - "default" # - "local" (local Maven repository) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2cc471cdf..d113ca627 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,16 @@ [versions] +# Plugins +detekt = "1.18.1" +dependencyupdates = "0.39.0" + # KotlinX -coroutines = "1.5.1" +coroutines = "1.5.2" # Core koin = "3.1.2" androidx-core = "1.6.0" androidx-appcompat = "1.3.1" -androidx-activity = "1.3.0" +androidx-activity = "1.3.1" androidx-fragment = "1.3.6" androiddesugarlibs = "1.1.5" @@ -22,11 +26,11 @@ modernandroidpreferences = "2.1.0" # Network jellyfin-sdk = "1.0.2" okhttp = "4.9.1" -coil = "1.3.1" +coil = "1.3.2" # Media -androidx-media = "1.4.0" -androidx-mediarouter = "1.2.4" +androidx-media = "1.4.1" +androidx-mediarouter = "1.2.5" exoplayer = "2.15.0" jellyfin-exoplayer-ffmpegextension = "2.15.0+2" playservices = "20.0.0" @@ -35,17 +39,21 @@ playservices = "20.0.0" androidx-room = "2.3.0" # Monitoring -timber = "4.7.1" +timber = "5.0.1" leakcanary = "2.7" redscreenofdeath = "0.1.3" # Testing junit = "5.7.2" -kotest = "4.6.1" +kotest = "4.6.2" mockk = "1.12.0" androidx-test-runner = "1.4.0" androidx-test-espresso = "3.4.0" +[plugins] +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" } +dependencyupdates = { id = "com.github.ben-manes.versions", version.ref = "dependencyupdates" } + [libraries] # KotlinX coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }