From 9ad1ff0cdeedd172b59bfeea5e84ae2e57485abd Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Wed, 28 Dec 2022 19:23:41 +0100 Subject: [PATCH] Update build files --- app/build.gradle.kts | 3 --- playback/core/build.gradle.kts | 3 --- playback/exoplayer/build.gradle.kts | 3 --- playback/jellyfin/build.gradle.kts | 13 +++++++++---- playback/ui/build.gradle.kts | 13 +++++++++---- preference/build.gradle.kts | 3 --- settings.gradle.kts | 2 ++ 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 75b52b86a..2c1813bf0 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -21,9 +21,6 @@ android { setProperty("archivesBaseName", "jellyfin-androidtv-v$versionName") } - sourceSets["main"].java.srcDirs("src/main/kotlin") - sourceSets["test"].java.srcDirs("src/test/kotlin") - buildFeatures { viewBinding = true compose = true diff --git a/playback/core/build.gradle.kts b/playback/core/build.gradle.kts index cb2770c00..477b6e953 100644 --- a/playback/core/build.gradle.kts +++ b/playback/core/build.gradle.kts @@ -13,9 +13,6 @@ android { targetSdk = 33 } - sourceSets["main"].java.srcDirs("src/main/kotlin") - sourceSets["test"].java.srcDirs("src/test/kotlin") - lint { lintConfig = file("$rootDir/android-lint.xml") abortOnError = false diff --git a/playback/exoplayer/build.gradle.kts b/playback/exoplayer/build.gradle.kts index 31d657449..9ee2360c2 100644 --- a/playback/exoplayer/build.gradle.kts +++ b/playback/exoplayer/build.gradle.kts @@ -12,9 +12,6 @@ android { targetSdk = 33 } - sourceSets["main"].java.srcDirs("src/main/kotlin") - sourceSets["test"].java.srcDirs("src/test/kotlin") - lint { lintConfig = file("$rootDir/android-lint.xml") abortOnError = false diff --git a/playback/jellyfin/build.gradle.kts b/playback/jellyfin/build.gradle.kts index 1d97932de..6af166f56 100644 --- a/playback/jellyfin/build.gradle.kts +++ b/playback/jellyfin/build.gradle.kts @@ -12,9 +12,6 @@ android { targetSdk = 33 } - sourceSets["main"].java.srcDirs("src/main/kotlin") - sourceSets["test"].java.srcDirs("src/test/kotlin") - lint { lintConfig = file("$rootDir/android-lint.xml") abortOnError = false @@ -28,7 +25,15 @@ android { dependencies { // Jellyfin implementation(projects.playback.core) - implementation(libs.jellyfin.sdk) + implementation(libs.jellyfin.sdk) { + // Change version if desired + val sdkVersion = findProperty("sdk.version")?.toString() + when (sdkVersion) { + "local" -> version { strictly("latest-SNAPSHOT") } + "snapshot" -> version { strictly("master-SNAPSHOT") } + "unstable-snapshot" -> version { strictly("openapi-unstable-SNAPSHOT") } + } + } // Logging implementation(libs.timber) diff --git a/playback/ui/build.gradle.kts b/playback/ui/build.gradle.kts index a1a63f109..af1e09808 100644 --- a/playback/ui/build.gradle.kts +++ b/playback/ui/build.gradle.kts @@ -16,9 +16,6 @@ android { viewBinding = true } - sourceSets["main"].java.srcDirs("src/main/kotlin") - sourceSets["test"].java.srcDirs("src/test/kotlin") - lint { lintConfig = file("$rootDir/android-lint.xml") abortOnError = false @@ -33,7 +30,15 @@ dependencies { // Jellyfin implementation(projects.playback.core) implementation(projects.playback.jellyfin) - implementation(libs.jellyfin.sdk) + implementation(libs.jellyfin.sdk) { + // Change version if desired + val sdkVersion = findProperty("sdk.version")?.toString() + when (sdkVersion) { + "local" -> version { strictly("latest-SNAPSHOT") } + "snapshot" -> version { strictly("master-SNAPSHOT") } + "unstable-snapshot" -> version { strictly("openapi-unstable-SNAPSHOT") } + } + } // Android(x) implementation(libs.androidx.core) diff --git a/preference/build.gradle.kts b/preference/build.gradle.kts index 2a8a6e53c..301c5b6d7 100644 --- a/preference/build.gradle.kts +++ b/preference/build.gradle.kts @@ -16,9 +16,6 @@ android { viewBinding = true } - sourceSets["main"].java.srcDirs("src/main/kotlin") - sourceSets["test"].java.srcDirs("src/test/kotlin") - lint { lintConfig = file("$rootDir/android-lint.xml") abortOnError = false diff --git a/settings.gradle.kts b/settings.gradle.kts index 553dc7433..03f0c9d7a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,7 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") +rootProject.name = "jellyfin-androidtv" + // Application include(":app")