From a6b9f25182c31f2c46d66c32c7dad894445d5678 Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 24 Nov 2022 09:37:34 +0100 Subject: [PATCH 1/2] Use Piped's fork of nanojson for better performance Also, our fork of nanojson was outdated, while FireMasterK's is not --- build.gradle | 2 +- extractor/build.gradle | 2 +- timeago-parser/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 8de56dde7b..bab634c4e9 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ allprojects { } ext { - nanojsonVersion = "1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751" + nanojsonVersion = "5df3e81e87b791d01f132f376e4b7d4a1780f346" spotbugsVersion = "4.7.3" junitVersion = "5.9.1" checkstyleVersion = "9.3" // do not use latest version (10.0) as it requires compile JDK 11 diff --git a/extractor/build.gradle b/extractor/build.gradle index 958aeece93..c32556c749 100644 --- a/extractor/build.gradle +++ b/extractor/build.gradle @@ -25,7 +25,7 @@ checkstyleTest { dependencies { implementation project(':timeago-parser') - implementation "com.github.TeamNewPipe:nanojson:$nanojsonVersion" + implementation "com.github.FireMasterK:nanojson:$nanojsonVersion" implementation 'org.jsoup:jsoup:1.15.3' implementation "com.github.spotbugs:spotbugs-annotations:$spotbugsVersion" implementation 'org.nibor.autolink:autolink:0.10.0' diff --git a/timeago-parser/build.gradle b/timeago-parser/build.gradle index 7ccf00291c..231abd47ac 100644 --- a/timeago-parser/build.gradle +++ b/timeago-parser/build.gradle @@ -1,4 +1,4 @@ dependencies { - implementation "com.github.TeamNewPipe:nanojson:$nanojsonVersion" + implementation "com.github.FireMasterK:nanojson:$nanojsonVersion" implementation "com.github.spotbugs:spotbugs-annotations:$spotbugsVersion" } From 857ae0aa861bb7d1e479a29fdf71081e624cd74c Mon Sep 17 00:00:00 2001 From: Stypox Date: Thu, 24 Nov 2022 17:21:57 +0100 Subject: [PATCH 2/2] Use nanojson without fastutil --- build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index bab634c4e9..21093c2fd2 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,9 @@ allprojects { } ext { - nanojsonVersion = "5df3e81e87b791d01f132f376e4b7d4a1780f346" + // When updating nanojson from FireMasterK's fork, take the last commit that does not use + // fastutil, since we don't want to add fastutil as a dependency of NewPipeExtractor. + nanojsonVersion = "7056f30ab24294a507cd2b2d56073181ca9bcc8b" spotbugsVersion = "4.7.3" junitVersion = "5.9.1" checkstyleVersion = "9.3" // do not use latest version (10.0) as it requires compile JDK 11