From e310942db3a109bc54174564f5fa47b47f38e8a4 Mon Sep 17 00:00:00 2001 From: Maxr1998 Date: Sat, 31 Jul 2021 22:02:45 +0200 Subject: [PATCH 1/3] Upgrade to AGP 7.0.0 --- app/build.gradle.kts | 10 +++++----- build.gradle.kts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index d696d8b05..a54a7261c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -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") @@ -70,7 +70,7 @@ android { } } - flavorDimensions("variant") + flavorDimensions += "variant" productFlavors { register("libre") { dimension = "variant" @@ -94,7 +94,7 @@ android { compileOptions { isCoreLibraryDesugaringEnabled = true } - lintOptions { + lint { isAbortOnError = false sarifReport = true disable("MissingTranslation", "ExtraTranslation") diff --git a/build.gradle.kts b/build.gradle.kts index 17adf11e5..49b5fba5f 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: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") } From 56f5393ec3082a93358a31e5422fb2adb91828e2 Mon Sep 17 00:00:00 2001 From: Maxr1998 Date: Sat, 31 Jul 2021 22:10:20 +0200 Subject: [PATCH 2/3] Update Kotlin to 1.5.21 --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index 79f6f91d3..b8de8ebdd 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -5,7 +5,7 @@ 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" diff --git a/gradle.properties b/gradle.properties index e60cff527..cfe641c1e 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.10 +kotlinVersion=1.5.21 # Allow using snapshot releases of Jellyfin SDK. Possible values are: # - "default" # - "local" (local Maven repository) From 341ed269bdf13fd24ecbc6f6c40c6aae65b59e8c Mon Sep 17 00:00:00 2001 From: Maxr1998 Date: Sat, 31 Jul 2021 22:30:49 +0200 Subject: [PATCH 3/3] Update dependencies --- buildSrc/src/main/kotlin/Dependencies.kt | 32 ++++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index b8de8ebdd..1f80fd69d 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -8,19 +8,19 @@ object Dependencies { 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" @@ -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" }