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.

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

Dependency updates #476

Merged
merged 3 commits into from
Jul 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ detekt {
}

android {
compileSdkVersion(30)
compileSdk = 30
defaultConfig {
applicationId = "org.jellyfin.mobile"
minSdkVersion(21)
targetSdkVersion(30)
minSdk = 21
targetSdk = 30
versionName = project.getVersionName()
versionCode = getVersionCode(versionName!!)
setProperty("archivesBaseName", "jellyfin-android-v$versionName")
Expand Down Expand Up @@ -70,7 +70,7 @@ android {
}
}

flavorDimensions("variant")
flavorDimensions += "variant"
productFlavors {
register("libre") {
dimension = "variant"
Expand All @@ -94,7 +94,7 @@ android {
compileOptions {
isCoreLibraryDesugaringEnabled = true
}
lintOptions {
lint {
isAbortOnError = false
sarifReport = true
disable("MissingTranslation", "ExtraTranslation")
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
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:4.2.1")
classpath("com.android.tools.build:gradle:7.0.0")
classpath(kotlin("gradle-plugin", kotlinVersion))
classpath("de.mannodermaus.gradle.plugins:android-junit5:1.7.1.1")
}
Expand Down
34 changes: 17 additions & 17 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@ object Dependencies {
const val detekt = "1.17.1"

// KotlinX
const val coroutines = "1.5.0"
const val coroutines = "1.5.1"

// Core
const val koin = "3.0.2"
const val appCompat = "1.3.0"
const val androidxCore = "1.5.0"
const val activity = "1.2.3"
const val fragment = "1.3.4"
const val exoPlayer = "2.14.0"
const val koin = "3.1.2"
const val appCompat = "1.3.1"
const val androidxCore = "1.6.0"
const val activity = "1.3.0"
const val fragment = "1.3.6"
const val exoPlayer = "2.14.2"

// Lifecycle
const val lifecycleExtensions = "2.3.1"

// UI
const val constraintLayout = "2.0.4"
const val material = "1.3.0"
const val constraintLayout = "2.1.0"
const val material = "1.4.0"
const val webkitX = "1.4.0"
const val modernAndroidPreferences = "2.1.0"

Expand All @@ -33,24 +33,24 @@ object Dependencies {
const val jellyfinSdkSnapshot = "master-SNAPSHOT"
const val jellyfinSdkSnapshotUnstable = "openapi-unstable-SNAPSHOT"
const val okHttp = "4.9.1"
const val coil = "1.1.1"
const val coil = "1.3.1"

// Cast
const val mediaRouter = "1.2.3"
const val playServicesCast = "19.0.0"
const val mediaRouter = "1.2.4"
const val playServicesCast = "20.0.0"

// Media
const val media = "1.3.1"
const val media = "1.4.0"

// Health
const val timber = "4.7.1"
const val leakCanary = "2.7"
const val redScreenOfDeath = "0.1.3"
const val junit = "5.7.2"
const val kotest = "4.6.0"
const val mockk = "1.11.0"
const val androidXRunner = "1.3.0"
const val androidXEspresso = "3.3.0"
const val kotest = "4.6.1"
const val mockk = "1.12.0"
const val androidXRunner = "1.4.0"
const val androidXEspresso = "3.4.0"
const val androidDesugarLibs = "1.1.5"
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
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.10
kotlinVersion=1.5.21
# Allow using snapshot releases of Jellyfin SDK. Possible values are:
# - "default"
# - "local" (local Maven repository)
Expand Down