From 6db0970543d745066aa73c3b5ee9376e4de8c909 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Thu, 13 Feb 2025 11:14:33 -0500 Subject: [PATCH 01/27] updated version catalogs --- core/build.gradle | 2 +- gradle/libs.versions.toml | 8 ++++++-- processor/build.gradle | 2 +- processor/notices/build.gradle | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 019cba6bad..be4865010c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -31,7 +31,7 @@ dependencies { annotationProcessor 'com.google.auto.value:auto-value:1.7.4' compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' implementation 'org.apache.commons:commons-compress:1.20' - implementation 'org.apache.commons:commons-lang3:3.0' + implementation libs.commons.lang3 implementation 'javax.inject:javax.inject:1' implementation 'org.apache.httpcomponents:httpclient:4.5.2' implementation 'commons-io:commons-io:2.8.0' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9aa3152255..bae30d55a1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,11 @@ [versions] spotless = "7.0.2" -shadow-jar = '7.1.2' +shadow-jar = "7.1.2" +apacheCommonsLang = "3.6" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } -shadow-jar = { id = 'com.github.johnrengelman.shadow', version.ref = 'shadow-jar' } \ No newline at end of file +shadow-jar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-jar" } + +[libraries] +commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apacheCommonsLang" } \ No newline at end of file diff --git a/processor/build.gradle b/processor/build.gradle index bf5227fc40..3cbe1d4b43 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -11,7 +11,7 @@ dependencies { compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' implementation 'javax.inject:javax.inject:1' implementation 'com.squareup:javapoet:1.13.0' - implementation 'org.apache.commons:commons-lang3:3.6' + implementation libs.commons.lang3 implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.flogger:flogger:0.6' implementation 'com.univocity:univocity-parsers:2.9.0' diff --git a/processor/notices/build.gradle b/processor/notices/build.gradle index d923101adc..45fb9721b6 100644 --- a/processor/notices/build.gradle +++ b/processor/notices/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation project(':model') annotationProcessor 'com.google.auto.service:auto-service:1.0.1' compileOnly 'com.google.auto.service:auto-service:1.0.1' - implementation 'org.apache.commons:commons-lang3:3.0' + implementation libs.commons.lang3 implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.code.gson:gson:2.8.6' testImplementation group: 'junit', name: 'junit', version: '4.13' From 1db5ac9dec2aeef51bd430ba76bdcc31ad6b2b24 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Thu, 13 Feb 2025 11:35:55 -0500 Subject: [PATCH 02/27] resolved com.google.auto.service:auto-service version inconsistency --- gradle/libs.versions.toml | 4 +++- processor/build.gradle | 4 ++-- processor/notices/build.gradle | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bae30d55a1..368865fbb6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,10 +2,12 @@ spotless = "7.0.2" shadow-jar = "7.1.2" apacheCommonsLang = "3.6" +autoService = "1.0.1" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } shadow-jar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-jar" } [libraries] -commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apacheCommonsLang" } \ No newline at end of file +commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apacheCommonsLang" } +auto-service = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } \ No newline at end of file diff --git a/processor/build.gradle b/processor/build.gradle index 3cbe1d4b43..81352b5f7b 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -5,8 +5,8 @@ plugins { dependencies { implementation project(':model') implementation project(':core') - annotationProcessor 'com.google.auto.service:auto-service:1.0-rc4' - compileOnly 'com.google.auto.service:auto-service:1.0-rc4' + annotationProcessor libs.auto.service + compileOnly libs.auto.service annotationProcessor 'com.google.auto.value:auto-value:1.7.4' compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' implementation 'javax.inject:javax.inject:1' diff --git a/processor/notices/build.gradle b/processor/notices/build.gradle index 45fb9721b6..23fc1ff055 100644 --- a/processor/notices/build.gradle +++ b/processor/notices/build.gradle @@ -27,8 +27,8 @@ repositories { dependencies { implementation project(':model') - annotationProcessor 'com.google.auto.service:auto-service:1.0.1' - compileOnly 'com.google.auto.service:auto-service:1.0.1' + annotationProcessor libs.auto.service + compileOnly libs.auto.service implementation libs.commons.lang3 implementation 'com.google.guava:guava:31.0.1-jre' implementation 'com.google.code.gson:gson:2.8.6' From 9ece81e4b91d0ef72e0170ca434d768a476259a0 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Thu, 13 Feb 2025 16:36:16 -0500 Subject: [PATCH 03/27] resolved flogger, flogger system backend version inconsisitencies --- app/gui/build.gradle | 4 ++-- cli/build.gradle | 4 ++-- core/build.gradle | 4 ++-- gradle/libs.versions.toml | 6 +++++- main/build.gradle | 4 ++-- output-comparator/build.gradle | 4 ++-- processor/build.gradle | 2 +- processor/tests/build.gradle | 4 ++-- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app/gui/build.gradle b/app/gui/build.gradle index 1e90cd14d9..9d6c6fbfe4 100644 --- a/app/gui/build.gradle +++ b/app/gui/build.gradle @@ -25,8 +25,8 @@ mainClassName = 'org.mobilitydata.gtfsvalidator.app.gui.Main' dependencies { implementation project(':core') implementation project(':main') - implementation 'com.google.flogger:flogger:0.6' - implementation 'com.google.flogger:flogger-system-backend:0.6' + implementation libs.flogger + implementation libs.flogger.system.backend testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' diff --git a/cli/build.gradle b/cli/build.gradle index 3572bf6d60..b44ff3f79b 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -52,8 +52,8 @@ dependencies { implementation project(':main') implementation 'com.beust:jcommander:1.48' implementation 'com.google.code.gson:gson:2.8.6' - implementation 'com.google.flogger:flogger:0.6' - implementation 'com.google.flogger:flogger-system-backend:0.6' + implementation libs.flogger + implementation libs.flogger.system.backend implementation 'com.google.guava:guava:31.0.1-jre' testImplementation group: 'junit', name: 'junit', version: '4.13' diff --git a/core/build.gradle b/core/build.gradle index be4865010c..95a480f4e5 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -41,11 +41,11 @@ dependencies { implementation 'com.google.guava:guava:31.0.1-jre' implementation 'commons-validator:commons-validator:1.6' implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.13' - implementation 'com.google.flogger:flogger:0.6' + implementation libs.flogger implementation 'io.github.classgraph:classgraph:4.8.146' implementation 'org.aspectj:aspectjrt:1.9.20' implementation 'org.aspectj:aspectjweaver:1.9.20' - testImplementation 'com.google.flogger:flogger-system-backend:0.6' + testImplementation libs.flogger.system.backend testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation "com.google.truth:truth:1.0.1" testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 368865fbb6..c71cb2f848 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,8 @@ spotless = "7.0.2" shadow-jar = "7.1.2" apacheCommonsLang = "3.6" autoService = "1.0.1" +flogger = "0.6.0" +floggerBackend = "0.6" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -10,4 +12,6 @@ shadow-jar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-jar [libraries] commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apacheCommonsLang" } -auto-service = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } \ No newline at end of file +auto-service = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } +flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" } +flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "floggerBackend" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 8aa066d16e..f6f24af30c 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -36,8 +36,8 @@ dependencies { implementation 'javax.inject:javax.inject:1' implementation 'com.google.code.gson:gson:2.8.6' implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'com.google.flogger:flogger:0.6' - implementation 'com.google.flogger:flogger-system-backend:0.6' + implementation libs.flogger + implementation libs.flogger.system.backend implementation 'com.univocity:univocity-parsers:2.9.0' implementation 'com.google.geometry:s2-geometry:2.0.0' implementation 'org.thymeleaf:thymeleaf:3.0.15.RELEASE' diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index 8fa04d4cba..b6c6a20aa3 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -12,8 +12,8 @@ dependencies { annotationProcessor 'com.google.auto.value:auto-value:1.7.4' compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'com.google.flogger:flogger:0.5.1' - implementation 'com.google.flogger:flogger-system-backend:0.5.1' + implementation libs.flogger + implementation libs.flogger.system.backend implementation 'com.beust:jcommander:1.48' implementation 'com.google.code.gson:gson:2.8.6' testImplementation "com.google.truth:truth:1.0.1" diff --git a/processor/build.gradle b/processor/build.gradle index 81352b5f7b..7e802f40cc 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -13,7 +13,7 @@ dependencies { implementation 'com.squareup:javapoet:1.13.0' implementation libs.commons.lang3 implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'com.google.flogger:flogger:0.6' + implementation libs.flogger implementation 'com.univocity:univocity-parsers:2.9.0' implementation 'com.google.geometry:s2-geometry:2.0.0' testImplementation group: 'junit', name: 'junit', version: '4.13' diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index 7b3419c98b..fb7078560e 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -26,8 +26,8 @@ dependencies { annotationProcessor 'com.google.auto.value:auto-value:1.7.4' compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'com.google.flogger:flogger:0.6' - implementation 'com.google.flogger:flogger-system-backend:0.6' + implementation libs.flogger + implementation libs.flogger.system.backend implementation 'com.univocity:univocity-parsers:2.9.0' testImplementation 'junit:junit:4.13' testImplementation 'com.google.truth:truth:1.0.1' From 894451b6a4340ec266db6c78460788c946b1849b Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Thu, 13 Feb 2025 16:46:33 -0500 Subject: [PATCH 04/27] small fix --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c71cb2f848..dae2163481 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ spotless = "7.0.2" shadow-jar = "7.1.2" apacheCommonsLang = "3.6" autoService = "1.0.1" -flogger = "0.6.0" +flogger = "0.6" floggerBackend = "0.6" [plugins] From 3ef076a035c935ed1f020d416ee83d3ff8fce80c Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 10:01:55 -0500 Subject: [PATCH 05/27] libs.gson --- cli/build.gradle | 2 +- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- output-comparator/build.gradle | 2 +- processor/notices/build.gradle | 2 +- processor/notices/tests/build.gradle | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cli/build.gradle b/cli/build.gradle index b44ff3f79b..9198a23312 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -51,7 +51,7 @@ dependencies { implementation project(':core') implementation project(':main') implementation 'com.beust:jcommander:1.48' - implementation 'com.google.code.gson:gson:2.8.6' + implementation libs.gson implementation libs.flogger implementation libs.flogger.system.backend implementation 'com.google.guava:guava:31.0.1-jre' diff --git a/core/build.gradle b/core/build.gradle index 95a480f4e5..0f1a11f04d 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -36,7 +36,7 @@ dependencies { implementation 'org.apache.httpcomponents:httpclient:4.5.2' implementation 'commons-io:commons-io:2.8.0' implementation 'com.univocity:univocity-parsers:2.9.0' - implementation 'com.google.code.gson:gson:2.8.6' + implementation libs.gson implementation 'com.google.geometry:s2-geometry:2.0.0' implementation 'com.google.guava:guava:31.0.1-jre' implementation 'commons-validator:commons-validator:1.6' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dae2163481..d3f8637e21 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,6 +5,7 @@ apacheCommonsLang = "3.6" autoService = "1.0.1" flogger = "0.6" floggerBackend = "0.6" +gson = "2.8.6" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -14,4 +15,5 @@ shadow-jar = { id = "com.github.johnrengelman.shadow", version.ref = "shadow-jar commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "apacheCommonsLang" } auto-service = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" } -flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "floggerBackend" } \ No newline at end of file +flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "floggerBackend" } +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index f6f24af30c..4ea4bed145 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -34,7 +34,7 @@ dependencies { compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' implementation 'org.apache.httpcomponents.client5:httpclient5:5.0.3' implementation 'javax.inject:javax.inject:1' - implementation 'com.google.code.gson:gson:2.8.6' + implementation libs.gson implementation 'com.google.guava:guava:31.0.1-jre' implementation libs.flogger implementation libs.flogger.system.backend diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index b6c6a20aa3..e95fd9332a 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation libs.flogger implementation libs.flogger.system.backend implementation 'com.beust:jcommander:1.48' - implementation 'com.google.code.gson:gson:2.8.6' + implementation libs.gson testImplementation "com.google.truth:truth:1.0.1" testImplementation group: 'junit', name: 'junit', version: '4.9' } diff --git a/processor/notices/build.gradle b/processor/notices/build.gradle index 23fc1ff055..5a82454dbe 100644 --- a/processor/notices/build.gradle +++ b/processor/notices/build.gradle @@ -31,7 +31,7 @@ dependencies { compileOnly libs.auto.service implementation libs.commons.lang3 implementation 'com.google.guava:guava:31.0.1-jre' - implementation 'com.google.code.gson:gson:2.8.6' + implementation libs.gson testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.1.3' } diff --git a/processor/notices/tests/build.gradle b/processor/notices/tests/build.gradle index 94b00fdc19..248503888a 100644 --- a/processor/notices/tests/build.gradle +++ b/processor/notices/tests/build.gradle @@ -12,7 +12,7 @@ repositories { dependencies { annotationProcessor project(":processor:notices") implementation project(':model') - implementation 'com.google.code.gson:gson:2.8.6' + implementation libs.gson testImplementation 'junit:junit:4.13' testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' From 9889fda949938edae7e3f50cb0dd2c29cc59a080 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 10:23:05 -0500 Subject: [PATCH 06/27] libs.auto.value --- core/build.gradle | 4 ++-- gradle/libs.versions.toml | 4 +++- main/build.gradle | 4 ++-- model/build.gradle | 4 ++-- output-comparator/build.gradle | 4 ++-- processor/build.gradle | 4 ++-- processor/tests/build.gradle | 4 ++-- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 0f1a11f04d..5fea11584c 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -28,8 +28,8 @@ plugins { dependencies { implementation project(':model') annotationProcessor project(':processor:notices') - annotationProcessor 'com.google.auto.value:auto-value:1.7.4' - compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' + annotationProcessor libs.auto.value + compileOnly libs.auto.value implementation 'org.apache.commons:commons-compress:1.20' implementation libs.commons.lang3 implementation 'javax.inject:javax.inject:1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d3f8637e21..17c9529a32 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,6 +6,7 @@ autoService = "1.0.1" flogger = "0.6" floggerBackend = "0.6" gson = "2.8.6" +autoValue = "1.7.4" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -16,4 +17,5 @@ commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "ap auto-service = { module = "com.google.auto.service:auto-service", version.ref = "autoService" } flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" } flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "floggerBackend" } -gson = { module = "com.google.code.gson:gson", version.ref = "gson" } \ No newline at end of file +gson = { module = "com.google.code.gson:gson", version.ref = "gson" } +auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 4ea4bed145..9e844c0afd 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -30,8 +30,8 @@ dependencies { compileOnly project(':processor') implementation project(':model') implementation project(':core') - annotationProcessor 'com.google.auto.value:auto-value:1.7.4' - compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' + annotationProcessor libs.auto.value + compileOnly libs.auto.value implementation 'org.apache.httpcomponents.client5:httpclient5:5.0.3' implementation 'javax.inject:javax.inject:1' implementation libs.gson diff --git a/model/build.gradle b/model/build.gradle index 2ca9771567..6b66632132 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -10,8 +10,8 @@ plugins { dependencies { - annotationProcessor 'com.google.auto.value:auto-value:1.7.4' - compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' + annotationProcessor libs.auto.value + compileOnly libs.auto.value implementation 'org.jetbrains:annotations:20.1.0' implementation 'com.google.code.findbugs:jsr305:3.0.2' } diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index e95fd9332a..6f8e66df36 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -9,8 +9,8 @@ dependencies { implementation project(':core') implementation 'commons-io:commons-io:2.8.0' implementation 'com.google.api-client:google-api-client:1.31.2' - annotationProcessor 'com.google.auto.value:auto-value:1.7.4' - compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' + annotationProcessor libs.auto.value + compileOnly libs.auto.value implementation 'com.google.guava:guava:31.0.1-jre' implementation libs.flogger implementation libs.flogger.system.backend diff --git a/processor/build.gradle b/processor/build.gradle index 7e802f40cc..aeb529895d 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -7,8 +7,8 @@ dependencies { implementation project(':core') annotationProcessor libs.auto.service compileOnly libs.auto.service - annotationProcessor 'com.google.auto.value:auto-value:1.7.4' - compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' + annotationProcessor libs.auto.value + compileOnly libs.auto.value implementation 'javax.inject:javax.inject:1' implementation 'com.squareup:javapoet:1.13.0' implementation libs.commons.lang3 diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index fb7078560e..65c5c60cc9 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -23,8 +23,8 @@ dependencies { compileOnly project(':processor') implementation project(':model') implementation project(':core') - annotationProcessor 'com.google.auto.value:auto-value:1.7.4' - compileOnly 'com.google.auto.value:auto-value-annotations:1.7.4' + annotationProcessor libs.auto.value + compileOnly libs.auto.value implementation 'com.google.guava:guava:31.0.1-jre' implementation libs.flogger implementation libs.flogger.system.backend From b8fbcac07f970b156a0436c53540d978057942ac Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 10:31:50 -0500 Subject: [PATCH 07/27] libs.guava --- cli/build.gradle | 2 +- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- output-comparator/build.gradle | 2 +- processor/build.gradle | 2 +- processor/notices/build.gradle | 2 +- processor/tests/build.gradle | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cli/build.gradle b/cli/build.gradle index 9198a23312..60d89e68f4 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation libs.gson implementation libs.flogger implementation libs.flogger.system.backend - implementation 'com.google.guava:guava:31.0.1-jre' + implementation libs.guava testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.0.1' diff --git a/core/build.gradle b/core/build.gradle index 5fea11584c..9cb82f26f9 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -38,7 +38,7 @@ dependencies { implementation 'com.univocity:univocity-parsers:2.9.0' implementation libs.gson implementation 'com.google.geometry:s2-geometry:2.0.0' - implementation 'com.google.guava:guava:31.0.1-jre' + implementation libs.guava implementation 'commons-validator:commons-validator:1.6' implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.13' implementation libs.flogger diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 17c9529a32..b0b56b782a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ flogger = "0.6" floggerBackend = "0.6" gson = "2.8.6" autoValue = "1.7.4" +guava = "31.0.1-jre" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -18,4 +19,5 @@ auto-service = { module = "com.google.auto.service:auto-service", version.ref = flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" } flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "floggerBackend" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } -auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } \ No newline at end of file +auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 9e844c0afd..dff60c4802 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation 'org.apache.httpcomponents.client5:httpclient5:5.0.3' implementation 'javax.inject:javax.inject:1' implementation libs.gson - implementation 'com.google.guava:guava:31.0.1-jre' + implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend implementation 'com.univocity:univocity-parsers:2.9.0' diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index 6f8e66df36..706e7d8322 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -11,7 +11,7 @@ dependencies { implementation 'com.google.api-client:google-api-client:1.31.2' annotationProcessor libs.auto.value compileOnly libs.auto.value - implementation 'com.google.guava:guava:31.0.1-jre' + implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend implementation 'com.beust:jcommander:1.48' diff --git a/processor/build.gradle b/processor/build.gradle index aeb529895d..0b481b55bd 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -12,7 +12,7 @@ dependencies { implementation 'javax.inject:javax.inject:1' implementation 'com.squareup:javapoet:1.13.0' implementation libs.commons.lang3 - implementation 'com.google.guava:guava:31.0.1-jre' + implementation libs.guava implementation libs.flogger implementation 'com.univocity:univocity-parsers:2.9.0' implementation 'com.google.geometry:s2-geometry:2.0.0' diff --git a/processor/notices/build.gradle b/processor/notices/build.gradle index 5a82454dbe..561ca3b2a2 100644 --- a/processor/notices/build.gradle +++ b/processor/notices/build.gradle @@ -30,7 +30,7 @@ dependencies { annotationProcessor libs.auto.service compileOnly libs.auto.service implementation libs.commons.lang3 - implementation 'com.google.guava:guava:31.0.1-jre' + implementation libs.guava implementation libs.gson testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.1.3' diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index 65c5c60cc9..76ef05c7a7 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -25,7 +25,7 @@ dependencies { implementation project(':core') annotationProcessor libs.auto.value compileOnly libs.auto.value - implementation 'com.google.guava:guava:31.0.1-jre' + implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend implementation 'com.univocity:univocity-parsers:2.9.0' From 29256dbea291a315d2fe4a1c71c1116caeb759cc Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 10:41:44 -0500 Subject: [PATCH 08/27] libs.univocity.parsers --- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- processor/build.gradle | 2 +- processor/tests/build.gradle | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 9cb82f26f9..5e33e24792 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation 'javax.inject:javax.inject:1' implementation 'org.apache.httpcomponents:httpclient:4.5.2' implementation 'commons-io:commons-io:2.8.0' - implementation 'com.univocity:univocity-parsers:2.9.0' + implementation libs.univocity.parsers implementation libs.gson implementation 'com.google.geometry:s2-geometry:2.0.0' implementation libs.guava diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b0b56b782a..ad248dc5f5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,6 +8,7 @@ floggerBackend = "0.6" gson = "2.8.6" autoValue = "1.7.4" guava = "31.0.1-jre" +univocityParsers = "2.9.0" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -20,4 +21,5 @@ flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" } flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "floggerBackend" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } -guava = { module = "com.google.guava:guava", version.ref = "guava" } \ No newline at end of file +guava = { module = "com.google.guava:guava", version.ref = "guava" } +univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocityParsers" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index dff60c4802..3e53f22c9d 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -38,7 +38,7 @@ dependencies { implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend - implementation 'com.univocity:univocity-parsers:2.9.0' + implementation libs.univocity.parsers implementation 'com.google.geometry:s2-geometry:2.0.0' implementation 'org.thymeleaf:thymeleaf:3.0.15.RELEASE' implementation 'com.vladsch.flexmark:flexmark-all:0.64.8' diff --git a/processor/build.gradle b/processor/build.gradle index 0b481b55bd..34b7d7c933 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation libs.commons.lang3 implementation libs.guava implementation libs.flogger - implementation 'com.univocity:univocity-parsers:2.9.0' + implementation libs.univocity.parsers implementation 'com.google.geometry:s2-geometry:2.0.0' testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.0.1' diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index 76ef05c7a7..26d7b6eafa 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend - implementation 'com.univocity:univocity-parsers:2.9.0' + implementation libs.univocity.parsers testImplementation 'junit:junit:4.13' testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' From 08f46472d5ae7c86231ccac6d9f78dcd85d46f7e Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 10:46:29 -0500 Subject: [PATCH 09/27] libs.commons.compress --- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 5e33e24792..d5ab17d13b 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -30,7 +30,7 @@ dependencies { annotationProcessor project(':processor:notices') annotationProcessor libs.auto.value compileOnly libs.auto.value - implementation 'org.apache.commons:commons-compress:1.20' + implementation libs.commons.compress implementation libs.commons.lang3 implementation 'javax.inject:javax.inject:1' implementation 'org.apache.httpcomponents:httpclient:4.5.2' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ad248dc5f5..bde77618b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -9,6 +9,7 @@ gson = "2.8.6" autoValue = "1.7.4" guava = "31.0.1-jre" univocityParsers = "2.9.0" +commonsCompress = "1.20" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -22,4 +23,5 @@ flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", gson = { module = "com.google.code.gson:gson", version.ref = "gson" } auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } guava = { module = "com.google.guava:guava", version.ref = "guava" } -univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocityParsers" } \ No newline at end of file +univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocityParsers" } +commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } \ No newline at end of file From d962b56400de9502d0866b423a095f2d5cf4d742 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 10:59:46 -0500 Subject: [PATCH 10/27] libs.mockito.core --- app/gui/build.gradle | 2 +- cli/build.gradle | 2 +- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/gui/build.gradle b/app/gui/build.gradle index 9d6c6fbfe4..70518df568 100644 --- a/app/gui/build.gradle +++ b/app/gui/build.gradle @@ -30,7 +30,7 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' - testImplementation 'org.mockito:mockito-core:4.5.1' + testImplementation libs.mockito.core } jar { diff --git a/cli/build.gradle b/cli/build.gradle index 60d89e68f4..4f4ba75b10 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -59,6 +59,6 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' - testImplementation 'org.mockito:mockito-core:4.5.1' + testImplementation libs.mockito.core } diff --git a/core/build.gradle b/core/build.gradle index d5ab17d13b..34f2f09a19 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -49,7 +49,7 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation "com.google.truth:truth:1.0.1" testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' - testImplementation 'org.mockito:mockito-core:4.5.1' + testImplementation libs.mockito.core } jar { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bde77618b0..e7fac24daa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -10,6 +10,7 @@ autoValue = "1.7.4" guava = "31.0.1-jre" univocityParsers = "2.9.0" commonsCompress = "1.20" +mockito = "4.5.1" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -24,4 +25,5 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" } auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } guava = { module = "com.google.guava:guava", version.ref = "guava" } univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocityParsers" } -commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } \ No newline at end of file +commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } +mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 3e53f22c9d..2363582945 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -47,5 +47,5 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' - testImplementation 'org.mockito:mockito-core:4.5.1' + testImplementation libs.mockito.core } \ No newline at end of file From 6322bf0b745f6f656a65a08671eb458c0f1bac91 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 11:15:59 -0500 Subject: [PATCH 11/27] libs.auto.value.annotations --- core/build.gradle | 2 +- gradle/libs.versions.toml | 2 ++ main/build.gradle | 2 +- model/build.gradle | 2 +- output-comparator/build.gradle | 2 +- processor/build.gradle | 2 +- processor/tests/build.gradle | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 34f2f09a19..60dc0bac84 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation project(':model') annotationProcessor project(':processor:notices') annotationProcessor libs.auto.value - compileOnly libs.auto.value + compileOnly libs.auto.value.annotations implementation libs.commons.compress implementation libs.commons.lang3 implementation 'javax.inject:javax.inject:1' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e7fac24daa..1696d4bbf0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,6 +7,7 @@ flogger = "0.6" floggerBackend = "0.6" gson = "2.8.6" autoValue = "1.7.4" +autoValueAnnotations = "1.7.4" guava = "31.0.1-jre" univocityParsers = "2.9.0" commonsCompress = "1.20" @@ -23,6 +24,7 @@ flogger = { module = "com.google.flogger:flogger", version.ref = "flogger" } flogger-system-backend = { module = "com.google.flogger:flogger-system-backend", version.ref = "floggerBackend" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } auto-value = { module = "com.google.auto.value:auto-value", version.ref = "autoValue" } +auto-value-annotations = { module = "com.google.auto.value:auto-value-annotations", version.ref = "autoValueAnnotations" } guava = { module = "com.google.guava:guava", version.ref = "guava" } univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocityParsers" } commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } diff --git a/main/build.gradle b/main/build.gradle index 2363582945..a18bd68040 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -31,7 +31,7 @@ dependencies { implementation project(':model') implementation project(':core') annotationProcessor libs.auto.value - compileOnly libs.auto.value + compileOnly libs.auto.value.annotations implementation 'org.apache.httpcomponents.client5:httpclient5:5.0.3' implementation 'javax.inject:javax.inject:1' implementation libs.gson diff --git a/model/build.gradle b/model/build.gradle index 6b66632132..7b646b2034 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -11,7 +11,7 @@ plugins { dependencies { annotationProcessor libs.auto.value - compileOnly libs.auto.value + compileOnly libs.auto.value.annotations implementation 'org.jetbrains:annotations:20.1.0' implementation 'com.google.code.findbugs:jsr305:3.0.2' } diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index 706e7d8322..b0fedc8b71 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -10,7 +10,7 @@ dependencies { implementation 'commons-io:commons-io:2.8.0' implementation 'com.google.api-client:google-api-client:1.31.2' annotationProcessor libs.auto.value - compileOnly libs.auto.value + compileOnly libs.auto.value.annotations implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend diff --git a/processor/build.gradle b/processor/build.gradle index 34b7d7c933..11ddbf0306 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -8,7 +8,7 @@ dependencies { annotationProcessor libs.auto.service compileOnly libs.auto.service annotationProcessor libs.auto.value - compileOnly libs.auto.value + compileOnly libs.auto.value.annotations implementation 'javax.inject:javax.inject:1' implementation 'com.squareup:javapoet:1.13.0' implementation libs.commons.lang3 diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index 26d7b6eafa..a450d8b130 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation project(':model') implementation project(':core') annotationProcessor libs.auto.value - compileOnly libs.auto.value + compileOnly libs.auto.value.annotations implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend From 0f1ec9322bb498244f936a8ec9144d90a241434e Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 11:20:13 -0500 Subject: [PATCH 12/27] libs.junit --- gradle/libs.versions.toml | 4 +++- processor/notices/tests/build.gradle | 2 +- processor/tests/build.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1696d4bbf0..be45e6a14f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,6 +12,7 @@ guava = "31.0.1-jre" univocityParsers = "2.9.0" commonsCompress = "1.20" mockito = "4.5.1" +junit = "4.13" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -28,4 +29,5 @@ auto-value-annotations = { module = "com.google.auto.value:auto-value-annotation guava = { module = "com.google.guava:guava", version.ref = "guava" } univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocityParsers" } commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } -mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } \ No newline at end of file +mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } +junit = { module = "junit:junit", version.ref = "junit" } \ No newline at end of file diff --git a/processor/notices/tests/build.gradle b/processor/notices/tests/build.gradle index 248503888a..375af274be 100644 --- a/processor/notices/tests/build.gradle +++ b/processor/notices/tests/build.gradle @@ -13,7 +13,7 @@ dependencies { annotationProcessor project(":processor:notices") implementation project(':model') implementation libs.gson - testImplementation 'junit:junit:4.13' + testImplementation libs.junit testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' } diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index a450d8b130..c1fd92303b 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation libs.flogger implementation libs.flogger.system.backend implementation libs.univocity.parsers - testImplementation 'junit:junit:4.13' + testImplementation libs.junit testImplementation 'com.google.truth:truth:1.0.1' testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' } From 910674696d91b474d8710b8e782c03454287ede2 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 11:32:10 -0500 Subject: [PATCH 13/27] libs.truth --- app/gui/build.gradle | 2 +- cli/build.gradle | 2 +- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- output-comparator/build.gradle | 2 +- processor/build.gradle | 2 +- processor/notices/build.gradle | 2 +- processor/notices/tests/build.gradle | 2 +- processor/tests/build.gradle | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/gui/build.gradle b/app/gui/build.gradle index 70518df568..8ffcf37903 100644 --- a/app/gui/build.gradle +++ b/app/gui/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation libs.flogger implementation libs.flogger.system.backend testImplementation group: 'junit', name: 'junit', version: '4.13' - testImplementation 'com.google.truth:truth:1.0.1' + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' testImplementation libs.mockito.core } diff --git a/cli/build.gradle b/cli/build.gradle index 4f4ba75b10..5c59953ef7 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -57,7 +57,7 @@ dependencies { implementation libs.guava testImplementation group: 'junit', name: 'junit', version: '4.13' - testImplementation 'com.google.truth:truth:1.0.1' + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' testImplementation libs.mockito.core } diff --git a/core/build.gradle b/core/build.gradle index 60dc0bac84..d047789eed 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -47,7 +47,7 @@ dependencies { implementation 'org.aspectj:aspectjweaver:1.9.20' testImplementation libs.flogger.system.backend testImplementation group: 'junit', name: 'junit', version: '4.13' - testImplementation "com.google.truth:truth:1.0.1" + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' testImplementation libs.mockito.core } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index be45e6a14f..77290ee9c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -13,6 +13,7 @@ univocityParsers = "2.9.0" commonsCompress = "1.20" mockito = "4.5.1" junit = "4.13" +truth = "1.1.3" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -30,4 +31,5 @@ guava = { module = "com.google.guava:guava", version.ref = "guava" } univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocityParsers" } commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } -junit = { module = "junit:junit", version.ref = "junit" } \ No newline at end of file +junit = { module = "junit:junit", version.ref = "junit" } +truth = { module = "com.google.truth:truth", version.ref = "truth" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index a18bd68040..627b239f90 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -45,7 +45,7 @@ dependencies { implementation 'io.github.classgraph:classgraph:4.8.146' implementation 'org.locationtech.jts:jts-core:1.20.0' testImplementation group: 'junit', name: 'junit', version: '4.13' - testImplementation 'com.google.truth:truth:1.0.1' + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' testImplementation libs.mockito.core } \ No newline at end of file diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index b0fedc8b71..0d6a72e302 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation libs.flogger.system.backend implementation 'com.beust:jcommander:1.48' implementation libs.gson - testImplementation "com.google.truth:truth:1.0.1" + testImplementation libs.truth testImplementation group: 'junit', name: 'junit', version: '4.9' } diff --git a/processor/build.gradle b/processor/build.gradle index 11ddbf0306..9253a0d970 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -17,6 +17,6 @@ dependencies { implementation libs.univocity.parsers implementation 'com.google.geometry:s2-geometry:2.0.0' testImplementation group: 'junit', name: 'junit', version: '4.13' - testImplementation 'com.google.truth:truth:1.0.1' + testImplementation libs.truth } diff --git a/processor/notices/build.gradle b/processor/notices/build.gradle index 561ca3b2a2..cb9474d5b8 100644 --- a/processor/notices/build.gradle +++ b/processor/notices/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation libs.guava implementation libs.gson testImplementation group: 'junit', name: 'junit', version: '4.13' - testImplementation 'com.google.truth:truth:1.1.3' + testImplementation libs.truth } test { diff --git a/processor/notices/tests/build.gradle b/processor/notices/tests/build.gradle index 375af274be..9b7dcb47d8 100644 --- a/processor/notices/tests/build.gradle +++ b/processor/notices/tests/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation project(':model') implementation libs.gson testImplementation libs.junit - testImplementation 'com.google.truth:truth:1.0.1' + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' } diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index c1fd92303b..bd7349cee7 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -30,6 +30,6 @@ dependencies { implementation libs.flogger.system.backend implementation libs.univocity.parsers testImplementation libs.junit - testImplementation 'com.google.truth:truth:1.0.1' + testImplementation libs.truth testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' } From cc650bc76ecf1bef74d2b425e16d9223beba99e4 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 12:56:14 -0500 Subject: [PATCH 14/27] libs.truth.extension --- app/gui/build.gradle | 2 +- cli/build.gradle | 2 +- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- processor/notices/tests/build.gradle | 2 +- processor/tests/build.gradle | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/gui/build.gradle b/app/gui/build.gradle index 8ffcf37903..70c9c6a085 100644 --- a/app/gui/build.gradle +++ b/app/gui/build.gradle @@ -29,7 +29,7 @@ dependencies { implementation libs.flogger.system.backend testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth - testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' + testImplementation libs.truth.extension testImplementation libs.mockito.core } diff --git a/cli/build.gradle b/cli/build.gradle index 5c59953ef7..cdb83719cd 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -58,7 +58,7 @@ dependencies { testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth - testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' + testImplementation libs.truth.extension testImplementation libs.mockito.core } diff --git a/core/build.gradle b/core/build.gradle index d047789eed..2338a32392 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -48,7 +48,7 @@ dependencies { testImplementation libs.flogger.system.backend testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth - testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' + testImplementation libs.truth.extension testImplementation libs.mockito.core } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 77290ee9c1..001ed69c18 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,6 +14,7 @@ commonsCompress = "1.20" mockito = "4.5.1" junit = "4.13" truth = "1.1.3" +truthExtension = "1.0.1" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -32,4 +33,5 @@ univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commonsCompress" } mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } junit = { module = "junit:junit", version.ref = "junit" } -truth = { module = "com.google.truth:truth", version.ref = "truth" } \ No newline at end of file +truth = { module = "com.google.truth:truth", version.ref = "truth" } +truth-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truthExtension" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 627b239f90..df525af0f2 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -46,6 +46,6 @@ dependencies { implementation 'org.locationtech.jts:jts-core:1.20.0' testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth - testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' + testImplementation libs.truth.extension testImplementation libs.mockito.core } \ No newline at end of file diff --git a/processor/notices/tests/build.gradle b/processor/notices/tests/build.gradle index 9b7dcb47d8..c515b28dd4 100644 --- a/processor/notices/tests/build.gradle +++ b/processor/notices/tests/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation libs.gson testImplementation libs.junit testImplementation libs.truth - testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' + testImplementation libs.truth.extension } test { diff --git a/processor/tests/build.gradle b/processor/tests/build.gradle index bd7349cee7..e06624abd8 100644 --- a/processor/tests/build.gradle +++ b/processor/tests/build.gradle @@ -31,5 +31,5 @@ dependencies { implementation libs.univocity.parsers testImplementation libs.junit testImplementation libs.truth - testImplementation 'com.google.truth.extensions:truth-java8-extension:1.0.1' + testImplementation libs.truth.extension } From 148c69af6a08569d5e8f744e03ed0f952143af10 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 13:02:01 -0500 Subject: [PATCH 15/27] libs.javax.inject --- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- processor/build.gradle | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 2338a32392..d229edadd3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -32,7 +32,7 @@ dependencies { compileOnly libs.auto.value.annotations implementation libs.commons.compress implementation libs.commons.lang3 - implementation 'javax.inject:javax.inject:1' + implementation libs.javax.inject implementation 'org.apache.httpcomponents:httpclient:4.5.2' implementation 'commons-io:commons-io:2.8.0' implementation libs.univocity.parsers diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 001ed69c18..b6f6b1e868 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,6 +15,7 @@ mockito = "4.5.1" junit = "4.13" truth = "1.1.3" truthExtension = "1.0.1" +javaxInject = "1" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -34,4 +35,5 @@ commons-compress = { module = "org.apache.commons:commons-compress", version.ref mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } junit = { module = "junit:junit", version.ref = "junit" } truth = { module = "com.google.truth:truth", version.ref = "truth" } -truth-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truthExtension" } \ No newline at end of file +truth-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truthExtension" } +javax-inject = { module = "javax.inject:javax.inject", version.ref = "javaxInject" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index df525af0f2..9c561b0759 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -33,7 +33,7 @@ dependencies { annotationProcessor libs.auto.value compileOnly libs.auto.value.annotations implementation 'org.apache.httpcomponents.client5:httpclient5:5.0.3' - implementation 'javax.inject:javax.inject:1' + implementation libs.javax.inject implementation libs.gson implementation libs.guava implementation libs.flogger diff --git a/processor/build.gradle b/processor/build.gradle index 9253a0d970..0334068cbe 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -9,7 +9,7 @@ dependencies { compileOnly libs.auto.service annotationProcessor libs.auto.value compileOnly libs.auto.value.annotations - implementation 'javax.inject:javax.inject:1' + implementation libs.javax.inject implementation 'com.squareup:javapoet:1.13.0' implementation libs.commons.lang3 implementation libs.guava From af369c8e81fc3174cf65e2f78ae5b33ecd4fd3e7 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 13:06:26 -0500 Subject: [PATCH 16/27] libs.httpClient5 --- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b6f6b1e868..59762c4c8c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -16,6 +16,7 @@ junit = "4.13" truth = "1.1.3" truthExtension = "1.0.1" javaxInject = "1" +httpClient5 = "5.0.3" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -36,4 +37,5 @@ mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" } junit = { module = "junit:junit", version.ref = "junit" } truth = { module = "com.google.truth:truth", version.ref = "truth" } truth-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truthExtension" } -javax-inject = { module = "javax.inject:javax.inject", version.ref = "javaxInject" } \ No newline at end of file +javax-inject = { module = "javax.inject:javax.inject", version.ref = "javaxInject" } +httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpClient5" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 9c561b0759..94698d15af 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation project(':core') annotationProcessor libs.auto.value compileOnly libs.auto.value.annotations - implementation 'org.apache.httpcomponents.client5:httpclient5:5.0.3' + implementation libs.httpclient5 implementation libs.javax.inject implementation libs.gson implementation libs.guava From 10c1c8b75b5d3003bd5a7b227856d1b5afc711c8 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 13:20:41 -0500 Subject: [PATCH 17/27] libs.geometry --- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- main/build.gradle | 2 +- processor/build.gradle | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index d229edadd3..483457ecc4 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -37,7 +37,7 @@ dependencies { implementation 'commons-io:commons-io:2.8.0' implementation libs.univocity.parsers implementation libs.gson - implementation 'com.google.geometry:s2-geometry:2.0.0' + implementation libs.geometry implementation libs.guava implementation 'commons-validator:commons-validator:1.6' implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.13' diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 59762c4c8c..ed2d9ed7a7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -17,6 +17,7 @@ truth = "1.1.3" truthExtension = "1.0.1" javaxInject = "1" httpClient5 = "5.0.3" +geometry = "2.0.0" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -38,4 +39,5 @@ junit = { module = "junit:junit", version.ref = "junit" } truth = { module = "com.google.truth:truth", version.ref = "truth" } truth-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truthExtension" } javax-inject = { module = "javax.inject:javax.inject", version.ref = "javaxInject" } -httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpClient5" } \ No newline at end of file +httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpClient5" } +geometry = { module = "com.google.geometry:s2-geometry", version.ref = "geometry" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 94698d15af..fc2bdf0345 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -39,7 +39,7 @@ dependencies { implementation libs.flogger implementation libs.flogger.system.backend implementation libs.univocity.parsers - implementation 'com.google.geometry:s2-geometry:2.0.0' + implementation libs.geometry implementation 'org.thymeleaf:thymeleaf:3.0.15.RELEASE' implementation 'com.vladsch.flexmark:flexmark-all:0.64.8' implementation 'io.github.classgraph:classgraph:4.8.146' diff --git a/processor/build.gradle b/processor/build.gradle index 0334068cbe..1c3416536b 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -15,7 +15,7 @@ dependencies { implementation libs.guava implementation libs.flogger implementation libs.univocity.parsers - implementation 'com.google.geometry:s2-geometry:2.0.0' + implementation libs.geometry testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth } From cfa12aa69535308daa023aff41ee2ddaa92fc552 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 13:32:52 -0500 Subject: [PATCH 18/27] libs.classgraph --- core/build.gradle | 4 ++-- gradle/libs.versions.toml | 6 +++++- main/build.gradle | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 483457ecc4..eebabe08b8 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -40,9 +40,9 @@ dependencies { implementation libs.geometry implementation libs.guava implementation 'commons-validator:commons-validator:1.6' - implementation 'com.googlecode.libphonenumber:libphonenumber:8.12.13' + implementation libs.libphonenumber implementation libs.flogger - implementation 'io.github.classgraph:classgraph:4.8.146' + implementation libs.classgraph implementation 'org.aspectj:aspectjrt:1.9.20' implementation 'org.aspectj:aspectjweaver:1.9.20' testImplementation libs.flogger.system.backend diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ed2d9ed7a7..76bfc75860 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,6 +18,8 @@ truthExtension = "1.0.1" javaxInject = "1" httpClient5 = "5.0.3" geometry = "2.0.0" +libphonenumber = "8.12.13" +classgraph = "4.8.146" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -40,4 +42,6 @@ truth = { module = "com.google.truth:truth", version.ref = "truth" } truth-extension = { module = "com.google.truth.extensions:truth-java8-extension", version.ref = "truthExtension" } javax-inject = { module = "javax.inject:javax.inject", version.ref = "javaxInject" } httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpClient5" } -geometry = { module = "com.google.geometry:s2-geometry", version.ref = "geometry" } \ No newline at end of file +geometry = { module = "com.google.geometry:s2-geometry", version.ref = "geometry" } +libphonenumber = { module = "com.googlecode.libphonenumber:libphonenumber", version.ref = "libphonenumber" } +classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index fc2bdf0345..56d0116a31 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -42,7 +42,7 @@ dependencies { implementation libs.geometry implementation 'org.thymeleaf:thymeleaf:3.0.15.RELEASE' implementation 'com.vladsch.flexmark:flexmark-all:0.64.8' - implementation 'io.github.classgraph:classgraph:4.8.146' + implementation libs.classgraph implementation 'org.locationtech.jts:jts-core:1.20.0' testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth From 1405ed4424897d6deebcc360029bbd70dfc1d7e0 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 13:41:43 -0500 Subject: [PATCH 19/27] libs.location.tech, libs.thymeleaf --- gradle/libs.versions.toml | 6 +++++- main/build.gradle | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 76bfc75860..e20d347664 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -20,6 +20,8 @@ httpClient5 = "5.0.3" geometry = "2.0.0" libphonenumber = "8.12.13" classgraph = "4.8.146" +thymeleaf = "3.0.15.RELEASE" +locationtech = "1.20.0" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -44,4 +46,6 @@ javax-inject = { module = "javax.inject:javax.inject", version.ref = "javaxInjec httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "httpClient5" } geometry = { module = "com.google.geometry:s2-geometry", version.ref = "geometry" } libphonenumber = { module = "com.googlecode.libphonenumber:libphonenumber", version.ref = "libphonenumber" } -classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" } \ No newline at end of file +classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" } +location-tech = { module = "org.locationtech.jts:jts-core", version.ref = "locationtech" } +thymeleaf = { module = "org.thymeleaf:thymeleaf", version.ref = "thymeleaf" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 56d0116a31..2cba8d3b31 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -40,10 +40,10 @@ dependencies { implementation libs.flogger.system.backend implementation libs.univocity.parsers implementation libs.geometry - implementation 'org.thymeleaf:thymeleaf:3.0.15.RELEASE' + implementation libs.thymeleaf implementation 'com.vladsch.flexmark:flexmark-all:0.64.8' implementation libs.classgraph - implementation 'org.locationtech.jts:jts-core:1.20.0' + implementation libs.location.tech testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth testImplementation libs.truth.extension From 78cb62f5b2c08e879cd177d598fdb5539ae90d6d Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 15:56:42 -0500 Subject: [PATCH 20/27] libs.commons-io, flexmark --- core/build.gradle | 2 +- gradle/libs.versions.toml | 6 +++++- main/build.gradle | 2 +- output-comparator/build.gradle | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index eebabe08b8..d5b5539e16 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -34,7 +34,7 @@ dependencies { implementation libs.commons.lang3 implementation libs.javax.inject implementation 'org.apache.httpcomponents:httpclient:4.5.2' - implementation 'commons-io:commons-io:2.8.0' + implementation libs.commons.io implementation libs.univocity.parsers implementation libs.gson implementation libs.geometry diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e20d347664..64b0055052 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,6 +22,8 @@ libphonenumber = "8.12.13" classgraph = "4.8.146" thymeleaf = "3.0.15.RELEASE" locationtech = "1.20.0" +flexmark = "0.64.8" +commonsIO = "2.8.0" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -48,4 +50,6 @@ geometry = { module = "com.google.geometry:s2-geometry", version.ref = "geometry libphonenumber = { module = "com.googlecode.libphonenumber:libphonenumber", version.ref = "libphonenumber" } classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" } location-tech = { module = "org.locationtech.jts:jts-core", version.ref = "locationtech" } -thymeleaf = { module = "org.thymeleaf:thymeleaf", version.ref = "thymeleaf" } \ No newline at end of file +thymeleaf = { module = "org.thymeleaf:thymeleaf", version.ref = "thymeleaf" } +flexmark = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" } +commons-io = { module = "commons-io:commons-io", version.ref = "commonsIO" } \ No newline at end of file diff --git a/main/build.gradle b/main/build.gradle index 2cba8d3b31..62bf32b352 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -41,7 +41,7 @@ dependencies { implementation libs.univocity.parsers implementation libs.geometry implementation libs.thymeleaf - implementation 'com.vladsch.flexmark:flexmark-all:0.64.8' + implementation libs.flexmark implementation libs.classgraph implementation libs.location.tech testImplementation group: 'junit', name: 'junit', version: '4.13' diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index 0d6a72e302..8fa65e4e35 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -7,7 +7,7 @@ plugins { dependencies { implementation project(':model') implementation project(':core') - implementation 'commons-io:commons-io:2.8.0' + implementation libs.commons.io implementation 'com.google.api-client:google-api-client:1.31.2' annotationProcessor libs.auto.value compileOnly libs.auto.value.annotations From 2e2d2150d636cc4d1518e3240ff1692e89ed321a Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 16:04:14 -0500 Subject: [PATCH 21/27] libs.commons.validator --- core/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index d5b5539e16..21fe5c3e15 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -39,7 +39,7 @@ dependencies { implementation libs.gson implementation libs.geometry implementation libs.guava - implementation 'commons-validator:commons-validator:1.6' + implementation libs.commons.validator implementation libs.libphonenumber implementation libs.flogger implementation libs.classgraph diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 64b0055052..e22f5fa28e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -24,6 +24,7 @@ thymeleaf = "3.0.15.RELEASE" locationtech = "1.20.0" flexmark = "0.64.8" commonsIO = "2.8.0" +commonsValidator = "1.6" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -52,4 +53,5 @@ classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classg location-tech = { module = "org.locationtech.jts:jts-core", version.ref = "locationtech" } thymeleaf = { module = "org.thymeleaf:thymeleaf", version.ref = "thymeleaf" } flexmark = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" } -commons-io = { module = "commons-io:commons-io", version.ref = "commonsIO" } \ No newline at end of file +commons-io = { module = "commons-io:commons-io", version.ref = "commonsIO" } +commons-validator = { module = "commons-validator:commons-validator", version.ref = "commonsValidator" } \ No newline at end of file From bf9c99206b1b3283248a1db2f91da1d2d340b7fc Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 16:11:02 -0500 Subject: [PATCH 22/27] libs.jcommander --- cli/build.gradle | 2 +- gradle/libs.versions.toml | 4 +++- output-comparator/build.gradle | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cli/build.gradle b/cli/build.gradle index cdb83719cd..c4422eabb6 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -50,7 +50,7 @@ mainClassName = 'org.mobilitydata.gtfsvalidator.cli.Main' dependencies { implementation project(':core') implementation project(':main') - implementation 'com.beust:jcommander:1.48' + implementation libs.jcommander implementation libs.gson implementation libs.flogger implementation libs.flogger.system.backend diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e22f5fa28e..288e421ef3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -25,6 +25,7 @@ locationtech = "1.20.0" flexmark = "0.64.8" commonsIO = "2.8.0" commonsValidator = "1.6" +jcommander = "1.48" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -54,4 +55,5 @@ location-tech = { module = "org.locationtech.jts:jts-core", version.ref = "locat thymeleaf = { module = "org.thymeleaf:thymeleaf", version.ref = "thymeleaf" } flexmark = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" } commons-io = { module = "commons-io:commons-io", version.ref = "commonsIO" } -commons-validator = { module = "commons-validator:commons-validator", version.ref = "commonsValidator" } \ No newline at end of file +commons-validator = { module = "commons-validator:commons-validator", version.ref = "commonsValidator" } +jcommander = { module = "com.beust:jcommander", version.ref = "jcommander" } \ No newline at end of file diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index 8fa65e4e35..c2b68bf09e 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation libs.guava implementation libs.flogger implementation libs.flogger.system.backend - implementation 'com.beust:jcommander:1.48' + implementation libs.jcommander implementation libs.gson testImplementation libs.truth testImplementation group: 'junit', name: 'junit', version: '4.9' From 09dde5ce42f4ce9bf04fd164351a7f8b89baf966 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 17 Feb 2025 16:20:09 -0500 Subject: [PATCH 23/27] libs.java-poet, api-client --- gradle/libs.versions.toml | 6 +++++- output-comparator/build.gradle | 2 +- processor/build.gradle | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 288e421ef3..0ab4facfc2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -26,6 +26,8 @@ flexmark = "0.64.8" commonsIO = "2.8.0" commonsValidator = "1.6" jcommander = "1.48" +javaPoet = "1.13.0" +apiClient = "1.31.2" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -56,4 +58,6 @@ thymeleaf = { module = "org.thymeleaf:thymeleaf", version.ref = "thymeleaf" } flexmark = { module = "com.vladsch.flexmark:flexmark-all", version.ref = "flexmark" } commons-io = { module = "commons-io:commons-io", version.ref = "commonsIO" } commons-validator = { module = "commons-validator:commons-validator", version.ref = "commonsValidator" } -jcommander = { module = "com.beust:jcommander", version.ref = "jcommander" } \ No newline at end of file +jcommander = { module = "com.beust:jcommander", version.ref = "jcommander" } +java-poet = { module = "com.squareup:javapoet", version.ref = "javaPoet" } +api-client = { module = "com.google.api-client:google-api-client", version.ref = "apiClient" } \ No newline at end of file diff --git a/output-comparator/build.gradle b/output-comparator/build.gradle index c2b68bf09e..131cd5597e 100644 --- a/output-comparator/build.gradle +++ b/output-comparator/build.gradle @@ -8,7 +8,7 @@ dependencies { implementation project(':model') implementation project(':core') implementation libs.commons.io - implementation 'com.google.api-client:google-api-client:1.31.2' + implementation libs.api.client annotationProcessor libs.auto.value compileOnly libs.auto.value.annotations implementation libs.guava diff --git a/processor/build.gradle b/processor/build.gradle index 1c3416536b..3c7b3bf6ea 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -10,7 +10,7 @@ dependencies { annotationProcessor libs.auto.value compileOnly libs.auto.value.annotations implementation libs.javax.inject - implementation 'com.squareup:javapoet:1.13.0' + implementation libs.java.poet implementation libs.commons.lang3 implementation libs.guava implementation libs.flogger From 21ea23ada2d9a8d3d3c3d3da8fa3dc03c6039ecb Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Tue, 18 Feb 2025 09:36:17 -0500 Subject: [PATCH 24/27] libs.jetbrains.annotations, aspectjrt, etc. --- core/build.gradle | 4 ++-- gradle/libs.versions.toml | 10 +++++++++- model/build.gradle | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/build.gradle b/core/build.gradle index 21fe5c3e15..5dac5c3581 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -43,8 +43,8 @@ dependencies { implementation libs.libphonenumber implementation libs.flogger implementation libs.classgraph - implementation 'org.aspectj:aspectjrt:1.9.20' - implementation 'org.aspectj:aspectjweaver:1.9.20' + implementation libs.aspectjrt + implementation libs.aspectjrt.weaver testImplementation libs.flogger.system.backend testImplementation group: 'junit', name: 'junit', version: '4.13' testImplementation libs.truth diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ab4facfc2..9f682f614d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,6 +28,10 @@ commonsValidator = "1.6" jcommander = "1.48" javaPoet = "1.13.0" apiClient = "1.31.2" +jetbrainsAnnotations = "20.1.0" +aspectjrt = "1.9.20" +aspectjrtweaver = "1.9.20" +findbugs = "3.0.2" [plugins] spotless = { id = "com.diffplug.spotless", version.ref = "spotless" } @@ -60,4 +64,8 @@ commons-io = { module = "commons-io:commons-io", version.ref = "commonsIO" } commons-validator = { module = "commons-validator:commons-validator", version.ref = "commonsValidator" } jcommander = { module = "com.beust:jcommander", version.ref = "jcommander" } java-poet = { module = "com.squareup:javapoet", version.ref = "javaPoet" } -api-client = { module = "com.google.api-client:google-api-client", version.ref = "apiClient" } \ No newline at end of file +api-client = { module = "com.google.api-client:google-api-client", version.ref = "apiClient" } +jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrainsAnnotations" } +aspectjrt = { module = "org.aspectj:aspectjrt", version.ref = "aspectjrt" } +aspectjrt-weaver = { module = "org.aspectj:aspectjweaver", version.ref = "aspectjrtweaver" } +findbugs = { module = "com.google.code.findbugs:jsr305", version.ref = "findbugs" } \ No newline at end of file diff --git a/model/build.gradle b/model/build.gradle index 7b646b2034..6d822105ab 100644 --- a/model/build.gradle +++ b/model/build.gradle @@ -12,6 +12,6 @@ plugins { dependencies { annotationProcessor libs.auto.value compileOnly libs.auto.value.annotations - implementation 'org.jetbrains:annotations:20.1.0' - implementation 'com.google.code.findbugs:jsr305:3.0.2' + implementation libs.jetbrains.annotations + implementation libs.findbugs } From 3fdf7f45b648ecf7d75affa2f522166d760498b5 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Tue, 18 Feb 2025 10:16:38 -0500 Subject: [PATCH 25/27] used httpclient5 for all libraries --- app/gui/build.gradle | 2 +- cli/build.gradle | 2 +- core/build.gradle | 2 +- web/service/build.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/gui/build.gradle b/app/gui/build.gradle index 70c9c6a085..f572af0709 100644 --- a/app/gui/build.gradle +++ b/app/gui/build.gradle @@ -47,7 +47,7 @@ shadowJar { // loaded via reflection exclude(project(':main')) - exclude(dependency('org.apache.httpcomponents:httpclient')) + exclude(dependency(libs.httpclient5)) } // Some of our dependencies include their own module-info declarations. We drop diff --git a/cli/build.gradle b/cli/build.gradle index c4422eabb6..5aa226fd55 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -37,7 +37,7 @@ shadowJar { // Validator classes are loaded dynamically from the main project, so we exclude the project // from minimization. exclude(project(':main')) - exclude(dependency('org.apache.httpcomponents:httpclient')) + exclude(dependency(libs.httpClient5)) } // Change the JAR name from 'main' to 'gtfs-validator' archiveBaseName = rootProject.name diff --git a/core/build.gradle b/core/build.gradle index 5dac5c3581..12e78a018e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -33,7 +33,7 @@ dependencies { implementation libs.commons.compress implementation libs.commons.lang3 implementation libs.javax.inject - implementation 'org.apache.httpcomponents:httpclient:4.5.2' + implementation libs.httpclient5 implementation libs.commons.io implementation libs.univocity.parsers implementation libs.gson diff --git a/web/service/build.gradle b/web/service/build.gradle index 7b27c479d2..639a2db0c4 100644 --- a/web/service/build.gradle +++ b/web/service/build.gradle @@ -34,7 +34,7 @@ shadowJar { // Validator classes are loaded dynamically from the main project, so we exclude the project // from minimization. exclude(project(':main')) - exclude(dependency('org.apache.httpcomponents:httpclient')) + exclude(dependency(libs.httpclient5)) } // Change the JAR name from 'main' to 'gtfs-validator' archiveBaseName = rootProject.name From 3d1bca389bf1669d7cf73fdea58306af07fc8a00 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Wed, 19 Feb 2025 13:54:04 -0500 Subject: [PATCH 26/27] updated code to httpClient5 --- app/gui/build.gradle | 2 +- cli/build.gradle | 2 +- .../gtfsvalidator/util/HttpGetUtil.java | 18 ++++++++---------- web/service/build.gradle | 2 +- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/gui/build.gradle b/app/gui/build.gradle index f572af0709..0a1521636b 100644 --- a/app/gui/build.gradle +++ b/app/gui/build.gradle @@ -47,7 +47,7 @@ shadowJar { // loaded via reflection exclude(project(':main')) - exclude(dependency(libs.httpclient5)) + exclude(dependency(libs.httpclient5.get().toString())) } // Some of our dependencies include their own module-info declarations. We drop diff --git a/cli/build.gradle b/cli/build.gradle index 5aa226fd55..53f371f44e 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -37,7 +37,7 @@ shadowJar { // Validator classes are loaded dynamically from the main project, so we exclude the project // from minimization. exclude(project(':main')) - exclude(dependency(libs.httpClient5)) + exclude(dependency(libs.httpclient5.get().toString())) } // Change the JAR name from 'main' to 'gtfs-validator' archiveBaseName = rootProject.name diff --git a/core/src/main/java/org/mobilitydata/gtfsvalidator/util/HttpGetUtil.java b/core/src/main/java/org/mobilitydata/gtfsvalidator/util/HttpGetUtil.java index 6290be4a5f..4e77d30ede 100644 --- a/core/src/main/java/org/mobilitydata/gtfsvalidator/util/HttpGetUtil.java +++ b/core/src/main/java/org/mobilitydata/gtfsvalidator/util/HttpGetUtil.java @@ -20,10 +20,10 @@ import java.io.OutputStream; import java.net.URISyntaxException; import java.net.URL; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; +import org.apache.hc.client5.http.classic.methods.HttpGet; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; +import org.apache.hc.client5.http.impl.classic.HttpClients; public class HttpGetUtil { @@ -49,16 +49,14 @@ public static String getUserAgent(String validatorVersion) { * @param sourceUrl the fully qualified URL * @param outputStream the output stream * @param validatorVersion the version of the validator - * @throws IOException if no file could not be found at the specified location - * @throws URISyntaxException if URL is malformed */ public static void loadFromUrl(URL sourceUrl, OutputStream outputStream, String validatorVersion) throws IOException, URISyntaxException { try (CloseableHttpClient httpClient = HttpClients.createDefault()) { - HttpGet httpGet = new HttpGet(sourceUrl.toURI()); - httpGet.setHeader("User-Agent", getUserAgent(validatorVersion)); - try (CloseableHttpResponse httpResponse = httpClient.execute(httpGet)) { - httpResponse.getEntity().writeTo(outputStream); + HttpGet request = new HttpGet(sourceUrl.toString()); + request.addHeader("User-Agent", getUserAgent(validatorVersion)); + try (CloseableHttpResponse response = httpClient.execute(request)) { + response.getEntity().writeTo(outputStream); } } } diff --git a/web/service/build.gradle b/web/service/build.gradle index 639a2db0c4..a05ab9de1f 100644 --- a/web/service/build.gradle +++ b/web/service/build.gradle @@ -34,7 +34,7 @@ shadowJar { // Validator classes are loaded dynamically from the main project, so we exclude the project // from minimization. exclude(project(':main')) - exclude(dependency(libs.httpclient5)) + exclude(dependency(libs.httpclient5.get().toString())) } // Change the JAR name from 'main' to 'gtfs-validator' archiveBaseName = rootProject.name From 14ab3df9262be1637a6d427c41c2e2850cde8516 Mon Sep 17 00:00:00 2001 From: Jingsi Lu Date: Mon, 24 Feb 2025 09:29:52 -0500 Subject: [PATCH 27/27] libs.junit --- app/gui/build.gradle | 2 +- cli/build.gradle | 2 +- core/build.gradle | 2 +- main/build.gradle | 2 +- processor/build.gradle | 2 +- processor/notices/build.gradle | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/gui/build.gradle b/app/gui/build.gradle index 0a1521636b..90ae72d09a 100644 --- a/app/gui/build.gradle +++ b/app/gui/build.gradle @@ -27,7 +27,7 @@ dependencies { implementation project(':main') implementation libs.flogger implementation libs.flogger.system.backend - testImplementation group: 'junit', name: 'junit', version: '4.13' + testImplementation libs.junit testImplementation libs.truth testImplementation libs.truth.extension testImplementation libs.mockito.core diff --git a/cli/build.gradle b/cli/build.gradle index 53f371f44e..600b870f07 100644 --- a/cli/build.gradle +++ b/cli/build.gradle @@ -56,7 +56,7 @@ dependencies { implementation libs.flogger.system.backend implementation libs.guava - testImplementation group: 'junit', name: 'junit', version: '4.13' + testImplementation libs.junit testImplementation libs.truth testImplementation libs.truth.extension testImplementation libs.mockito.core diff --git a/core/build.gradle b/core/build.gradle index 12e78a018e..9fd1c014b3 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -46,7 +46,7 @@ dependencies { implementation libs.aspectjrt implementation libs.aspectjrt.weaver testImplementation libs.flogger.system.backend - testImplementation group: 'junit', name: 'junit', version: '4.13' + testImplementation libs.junit testImplementation libs.truth testImplementation libs.truth.extension testImplementation libs.mockito.core diff --git a/main/build.gradle b/main/build.gradle index 62bf32b352..743ca3a909 100644 --- a/main/build.gradle +++ b/main/build.gradle @@ -44,7 +44,7 @@ dependencies { implementation libs.flexmark implementation libs.classgraph implementation libs.location.tech - testImplementation group: 'junit', name: 'junit', version: '4.13' + testImplementation libs.junit testImplementation libs.truth testImplementation libs.truth.extension testImplementation libs.mockito.core diff --git a/processor/build.gradle b/processor/build.gradle index 3c7b3bf6ea..9622cef312 100644 --- a/processor/build.gradle +++ b/processor/build.gradle @@ -16,7 +16,7 @@ dependencies { implementation libs.flogger implementation libs.univocity.parsers implementation libs.geometry - testImplementation group: 'junit', name: 'junit', version: '4.13' + testImplementation libs.junit testImplementation libs.truth } diff --git a/processor/notices/build.gradle b/processor/notices/build.gradle index cb9474d5b8..376c17099f 100644 --- a/processor/notices/build.gradle +++ b/processor/notices/build.gradle @@ -32,7 +32,7 @@ dependencies { implementation libs.commons.lang3 implementation libs.guava implementation libs.gson - testImplementation group: 'junit', name: 'junit', version: '4.13' + testImplementation libs.junit testImplementation libs.truth }