Skip to content

fix: Restore FEATURE_PLUGINS_ENABLED and sideload plugin dependencies #359

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

Closed
test01203 wants to merge 3 commits into from
Closed

fix: Restore FEATURE_PLUGINS_ENABLED and sideload plugin dependencies #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
069588c
fix: Restore FEATURE_PLUGINS_ENABLED, compileSdk=36, and sideload plu…
Jun 11, 2026
685cb5f
fix: Resolve CI build failures and sideload Kotlin compilation
Jun 11, 2026
840a679
fix: Exclude conflicting MANIFEST.MF
Jun 11, 2026
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
33 changes: 32 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ plugins {

android {
namespace = "com.arflix.tv"
compileSdk = 35
compileSdk = 36

flavorDimensions += "distribution"

Expand Down Expand Up @@ -54,10 +54,12 @@ android {
create("play") {
dimension = "distribution"
buildConfigField("Boolean", "SELF_UPDATE_ENABLED", "false")
buildConfigField("Boolean", "FEATURE_PLUGINS_ENABLED", "false")
}
create("sideload") {
dimension = "distribution"
buildConfigField("Boolean", "SELF_UPDATE_ENABLED", "true")
buildConfigField("Boolean", "FEATURE_PLUGINS_ENABLED", "true")
}
}

Expand Down Expand Up @@ -151,6 +153,7 @@ android {

packaging {
resources {
excludes += "/META-INF/versions/9/OSGI-INF/MANIFEST.MF"
excludes += setOf(
"/META-INF/{AL2.0,LGPL2.1}",
"/META-INF/LICENSE*",
Expand Down Expand Up @@ -439,3 +442,31 @@ detekt {
}


kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
freeCompilerArgs.add("-Xskip-metadata-version-check")
}
}

dependencies {
ksp("org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0")
annotationProcessor("org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0")

// Plugin system dependencies (Sideload flavor only)
add("sideloadImplementation", files("libs/quickjs-kt-android-1.0.5-nuvio.aar"))
add("sideloadImplementation", "com.fasterxml.jackson.core:jackson-databind:2.17.0")
add("sideloadImplementation", "com.fasterxml.jackson.module:jackson-module-kotlin:2.17.0")
add("sideloadImplementation", "com.github.Blatzar:NiceHttp:0.4.11")
add("sideloadImplementation", "org.conscrypt:conscrypt-android:2.5.3")
add("sideloadImplementation", "com.github.recloudstream.cloudstream:library-android:v4.7.0") {
exclude(group = "org.mozilla", module = "rhino")
}
add("sideloadImplementation", "org.webjars.npm:crypto-js:4.2.0")

// Runtime helpers used by the sideload plugin extractor stack.
add("sideloadImplementation", "org.mozilla:rhino:1.8.1")
add("sideloadImplementation", "com.google.re2j:re2j:1.8")
}


8 changes: 8 additions & 0 deletions config/detekt/baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<SmellBaseline>
<ManuallySuppressedIssues/>
<CurrentIssues>
<!-- Run ./gradlew detektBaseline to generate baseline for existing issues -->
<!-- This allows you to enforce rules on new code while handling existing issues gradually -->
</CurrentIssues>
</SmellBaseline>
Loading
Loading