From 8683810a89be7c1e733d196f68549980d2304991 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <nielsvanvelzen@users.noreply.github.com>
Date: Thu, 8 Jul 2021 23:03:33 +0200
Subject: [PATCH] Miscellaneous build script changes (#289)

---
 android-lint.xml                           |  3 ++
 build.gradle.kts                           |  2 +-
 detekt.yml => detekt.yaml                  |  0
 gradle/libs.versions.toml                  | 32 +++++++++++-----------
 jellyfin-platform-android/build.gradle.kts |  1 +
 5 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 android-lint.xml
 rename detekt.yml => detekt.yaml (100%)

diff --git a/android-lint.xml b/android-lint.xml
new file mode 100644
index 00000000..e5689f06
--- /dev/null
+++ b/android-lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<lint>
+</lint>
diff --git a/build.gradle.kts b/build.gradle.kts
index eb732608..f008c1a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -69,7 +69,7 @@ subprojects {
 	detekt {
 		buildUponDefaultConfig = true
 		ignoreFailures = true
-		config = files("$rootDir/detekt.yml")
+		config = files("$rootDir/detekt.yaml")
 		basePath = rootDir.absolutePath
 
 		reports {
diff --git a/detekt.yml b/detekt.yaml
similarity index 100%
rename from detekt.yml
rename to detekt.yaml
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0f87ec6a..ca44669d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -6,19 +6,19 @@ ktor = "1.6.0"
 slf4j = "1.7.31"
 
 [libraries]
-androidx-annotation = { group = "androidx.annotation", name = "annotation", version = "1.2.0" }
-androidx-core = { group = "androidx.core", name = "core-ktx", version = "1.5.0" }
-clikt = { group = "com.github.ajalt.clikt", name = "clikt", version = "3.2.0" }
-kasechange = { group = "net.pearx.kasechange", name = "kasechange", version = "1.3.0" }
-koin = { group = "io.insert-koin", name = "koin-core", version = "3.1.0" }
-kotlin-test-junit = { group = "org.jetbrains.kotlin", name = "kotlin-test-junit", version.ref = "kotlin" }
-kotlinPoet = { group = "com.squareup", name = "kotlinpoet", version = "1.8.0" }
-kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
-kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
-ktor-http = { group = "io.ktor", name = "ktor-http", version.ref = "ktor" }
-ktor-io = { group = "io.ktor", name = "ktor-io", version.ref = "ktor" }
-ktor-okhttp = { group = "io.ktor", name = "ktor-client-okhttp", version.ref = "ktor" }
-ktor-serialization = { group = "io.ktor", name = "ktor-client-serialization-jvm", version.ref = "ktor" }
-slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
-slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }
-swaggerParser = { group = "io.swagger.parser.v3", name = "swagger-parser", version = "2.0.26" }
+androidx-annotation = { module = "androidx.annotation:annotation", version = "1.2.0" }
+androidx-core = { module = "androidx.core:core-ktx", version = "1.5.0" }
+clikt = { module = "com.github.ajalt.clikt:clikt", version = "3.2.0" }
+kasechange = { module = "net.pearx.kasechange:kasechange", version = "1.3.0" }
+koin = { module = "io.insert-koin:koin-core", version = "3.1.0" }
+kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
+kotlinPoet = { module = "com.squareup:kotlinpoet", version = "1.8.0" }
+kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }
+ktor-http = { module = "io.ktor:ktor-http", version.ref = "ktor" }
+ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
+ktor-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktor-serialization = { module = "io.ktor:ktor-client-serialization-jvm", version.ref = "ktor" }
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
+swaggerParser = { module = "io.swagger.parser.v3:swagger-parser", version = "2.0.26" }
diff --git a/jellyfin-platform-android/build.gradle.kts b/jellyfin-platform-android/build.gradle.kts
index 7ce7883d..5269385b 100644
--- a/jellyfin-platform-android/build.gradle.kts
+++ b/jellyfin-platform-android/build.gradle.kts
@@ -30,6 +30,7 @@ android {
 	}
 
 	lintOptions {
+		lintConfig = file("$rootDir/android-lint.xml")
 		isAbortOnError = false
 		sarifReport = true
 	}