diff --git a/extractor/build.gradle.kts b/extractor/build.gradle.kts index 3e90d45d79..8dfaadb8e0 100644 --- a/extractor/build.gradle.kts +++ b/extractor/build.gradle.kts @@ -17,6 +17,12 @@ java { withJavadocJar() } +sourceSets { + main { + java.srcDir("../timeago-parser/src/main/java") + } +} + // Protobuf files would uselessly end up in the JAR otherwise, see // https://github.com/google/protobuf-gradle-plugin/issues/390 tasks.jar { @@ -49,7 +55,10 @@ checkstyle { // Exclude Protobuf generated files from Checkstyle tasks.checkstyleMain { - exclude("org/schabi/newpipe/extractor/services/youtube/protos") + exclude( + "org/schabi/newpipe/extractor/services/youtube/protos", + "org/schabi/newpipe/extractor/timeago" + ) } tasks.checkstyleTest { @@ -57,8 +66,6 @@ tasks.checkstyleTest { } dependencies { - implementation(project(":timeago-parser")) - implementation(libs.newpipe.nanojson) implementation(libs.jsoup) implementation(libs.google.jsr305) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9ad111c29c..a1dfe4529b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,5 +18,5 @@ dependencyResolutionManagement { maven(url = "https://jitpack.io") } } -include("extractor", "timeago-parser", "timeago-generator") +include("extractor", "timeago-generator") rootProject.name = "NewPipeExtractor" diff --git a/timeago-generator/build.gradle.kts b/timeago-generator/build.gradle.kts index a031834ec1..6c4b9e1154 100644 --- a/timeago-generator/build.gradle.kts +++ b/timeago-generator/build.gradle.kts @@ -6,5 +6,4 @@ dependencies { implementation(libs.newpipe.nanojson) implementation(libs.google.jsr305) - implementation(project(":timeago-parser")) }