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

Add (empty) playback module and CODEOWNERS #1072

Merged
merged 2 commits into from
Aug 8, 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
15 changes: 15 additions & 0 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Build files
/.github/workflows/ @nielsvanvelzen
/.github/dependabot.yml @nielsvanvelzen
/gradle/ @nielsvanvelzen
/buildSrc/ @nielsvanvelzen
settings.gradle.ts @nielsvanvelzen
build.gradle.kts @nielsvanvelzen
gradle.properties @nielsvanvelzen

# Linting
android-lint.xml @nielsvanvelzen
detekt.yaml @nielsvanvelzen

# Playback code
/playback/ @nielsvanvelzen
3 changes: 2 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ val versionTxt by tasks.registering {
}

dependencies {
// Jellyfin apiclient & SDK
// Jellyfin
implementation(projects.playback)
implementation(libs.jellyfin.apiclient)
implementation(libs.jellyfin.sdk) {
// Change version if desired
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/VersionUtils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fun Project.getVersionName(fallback: String = "0.0.0-dev.1") =
* 2.0.0 -> 2000099
* 99.99.99-rc.1 -> 99999901
*/
fun getVersionCode(versionName: String): Int? {
fun getVersionCode(versionName: String): Int {
// Split to core and pre release parts with a default for pre release (null)
val (versionCore, versionPreRelease) =
when (val index = versionName.indexOf('-')) {
Expand Down
24 changes: 24 additions & 0 deletions playback/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
plugins {
id("com.android.library")
kotlin("android")
}

android {
compileSdkVersion(30)

defaultConfig {
minSdkVersion(21)
targetSdkVersion(30)
}

buildFeatures {
viewBinding = true
}

sourceSets["main"].java.srcDirs("src/main/kotlin")
sourceSets["test"].java.srcDirs("src/test/kotlin")
}

dependencies {

}
7 changes: 7 additions & 0 deletions playback/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.jellyfin.playback">

<application>

</application>
</manifest>
3 changes: 3 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ enableFeaturePreview("VERSION_CATALOGS")

// Application
include(":app")

// Modules
include(":playback")