From 7a4ef03e7a0aaaa0bd8d6d61e619fcc71db9a7d8 Mon Sep 17 00:00:00 2001 From: "Yevhen Babiichuk (DustDFG)" Date: Sat, 31 Jan 2026 12:22:18 +0200 Subject: [PATCH 1/2] settings.gradle.kts: apply changes applied by android-studio Each time you sync this file studio tries to reformat it and applies changes from this commit which makes commiting a bit more difficult so just commit it in git --- settings.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 60a40c985c9..7abf347fa82 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,15 +19,15 @@ dependencyResolutionManagement { maven(url = "https://repo.clojars.org") } } -include (":app") +include(":app") // Use a local copy of NewPipe Extractor by uncommenting the lines below. // We assume, that NewPipe and NewPipe Extractor have the same parent directory. // If this is not the case, please change the path in includeBuild(). -//includeBuild("../NewPipeExtractor") { +// includeBuild("../NewPipeExtractor") { // dependencySubstitution { // substitute(module("com.github.TeamNewPipe:NewPipeExtractor")) // .using(project(":extractor")) // } -//} +// } From b3ecf06908ca964930310f90566ad2f270049a44 Mon Sep 17 00:00:00 2001 From: "Yevhen Babiichuk (DustDFG)" Date: Sat, 31 Jan 2026 12:26:22 +0200 Subject: [PATCH 2/2] Run checkstyle for extractor when it is built from source --- app/build.gradle.kts | 6 +++++- settings.gradle.kts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 62afd852209..96e8165959e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -130,7 +130,6 @@ ksp { arg("room.schemaLocation", "$projectDir/schemas") } - // Custom dependency configuration for ktlint val ktlint by configurations.creating @@ -164,6 +163,11 @@ tasks.register("runCheckstyle") { xml.required = true html.required = true } + + // run checkstyle for extractor when it is built from source + if (gradle.extra.has("extractorIncluded")) { + dependsOn(gradle.includedBuild("NewPipeExtractor").task(":extractor:checkstyleMain")) + } } val outputDir = project.layout.buildDirectory.dir("reports/ktlint/") diff --git a/settings.gradle.kts b/settings.gradle.kts index 7abf347fa82..f8e57f1ec7d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,3 +31,4 @@ include(":app") // .using(project(":extractor")) // } // } +// gradle.extra["extractorIncluded"] = true