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 build files #2370

Merged
merged 1 commit into from
Dec 29, 2022
Merged

Update build files #2370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions playback/core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions playback/exoplayer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 9 additions & 4 deletions playback/jellyfin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
13 changes: 9 additions & 4 deletions playback/ui/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions preference/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")

rootProject.name = "jellyfin-androidtv"

// Application
include(":app")

Expand Down