Skip to content

Commit 7b5cdd1

Browse files
authored
Merge pull request #1421 from TeamNewPipe/jarFixes
Include timeago-parser classes manually
2 parents 4b27201 + 1ec2818 commit 7b5cdd1

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

extractor/build.gradle.kts

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ java {
1717
withJavadocJar()
1818
}
1919

20+
sourceSets {
21+
main {
22+
java.srcDir("../timeago-parser/src/main/java")
23+
}
24+
}
25+
2026
// Protobuf files would uselessly end up in the JAR otherwise, see
2127
// https://github.com/google/protobuf-gradle-plugin/issues/390
2228
tasks.jar {
@@ -49,16 +55,17 @@ checkstyle {
4955

5056
// Exclude Protobuf generated files from Checkstyle
5157
tasks.checkstyleMain {
52-
exclude("org/schabi/newpipe/extractor/services/youtube/protos")
58+
exclude(
59+
"org/schabi/newpipe/extractor/services/youtube/protos",
60+
"org/schabi/newpipe/extractor/timeago"
61+
)
5362
}
5463

5564
tasks.checkstyleTest {
5665
isEnabled = false // do not checkstyle test files
5766
}
5867

5968
dependencies {
60-
implementation(project(":timeago-parser"))
61-
6269
implementation(libs.newpipe.nanojson)
6370
implementation(libs.jsoup)
6471
implementation(libs.google.jsr305)

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ dependencyResolutionManagement {
1818
maven(url = "https://jitpack.io")
1919
}
2020
}
21-
include("extractor", "timeago-parser", "timeago-generator")
21+
include("extractor", "timeago-generator")
2222
rootProject.name = "NewPipeExtractor"

timeago-generator/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
dependencies {
77
implementation(libs.newpipe.nanojson)
88
implementation(libs.google.jsr305)
9-
implementation(project(":timeago-parser"))
109
}

0 commit comments

Comments
 (0)