Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #521

Merged
merged 5 commits into from
Sep 4, 2021
Merged

Update dependencies #521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccc1d17
Update AGP to 7.0.2
Maxr1998 Sep 4, 2021
aaf6a0b
Update Kotlin to 1.5.30
Maxr1998 Sep 4, 2021
d6674de
Update detekt to 1.18.1
Maxr1998 Sep 4, 2021
eb92238
Various library updates
Maxr1998 Sep 4, 2021
08279c5
Move plugins to version catalog
Maxr1998 Sep 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
10 changes: 0 additions & 10 deletions buildSrc/src/main/kotlin/Plugins.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
22 changes: 15 additions & 7 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand All @@ -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"
Expand All @@ -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" }
Expand Down