Changeset 36228 in osm for applications/editors/josm/plugins/MicrosoftStreetside/gradle

Timestamp:

2024-03-14T16:34:12+01:00 (2 years ago)

Author:

taylor.smock

Message:

StreetSide: Update to official API

This also moves the plugin to Java 21 (mostly for virtual threads), reformats the
code to match the JOSM standard (4 spaces), and fixes a bunch of lint issues.

Additionally, a lot of cruft from when this plugin was copied from Mapillary was
removed. That was largely related to image import, uploading, and login.

Location:

applications/editors/josm/plugins/MicrosoftStreetside/gradle

Files:

• libs.versions.toml (added)
• tool-config.gradle (modified) (3 diffs)
• wrapper/gradle-wrapper.jar (modified) ( previous)
• wrapper/gradle-wrapper.properties (modified) (1 diff)

applications/editors/josm/plugins/MicrosoftStreetside/gradle/tool-config.gradle

@@ -1 @@
-def pmdVersion = "6.36.0"
-def spotbugsVersion = "4.3.0"
-def jacocoVersion = "0.8.7"
-def errorproneVersion = "2.7.1"
-
-// Set up ErrorProne (currently only for JDK8, until JDK9 is supported)
-dependencies.errorprone "com.google.errorprone:error_prone_core:$errorproneVersion"
-/*
-tasks.withType(JavaCompile) {
-options.compilerArgs += ['-Xep:DefaultCharset:ERROR',
-  '-Xep:ClassCanBeStatic:ERROR',
-  '-Xep:StringEquality:ERROR',
-  '-Xep:MethodCanBeStatic:WARN',
-  '-Xep:RemoveUnusedImports:WARN',
-  '-Xep:PrivateConstructorForUtilityClass:WARN',
-  '-Xep:WildcardImport:WARN',
-  '-Xep:LambdaFunctionalInterface:WARN',
-  '-Xep:ConstantField:WARN']
-}
-*/
-
-// Spotbugs config
-spotbugs {
-  toolVersion = spotbugsVersion
-  ignoreFailures = true
-  effort = "max"
-  reportLevel = "low"
-  //sourceSets = [sourceSets.main, sourceSets.test]
-}
-
 // JaCoCo config
 jacoco {
-  toolVersion = jacocoVersion
+  toolVersion = libs.versions.jacoco.get()
 }
 jacocoTestReport {
   reports {
-    xml.enabled = true
-    html.destination file("$buildDir/reports/jacoco")
+    xml.required = true
   }
+  dependsOn test
 }
 build.dependsOn jacocoTestReport
@@ -43 +13 @@
 // PMD config
 pmd {
-  toolVersion pmdVersion
+  toolVersion libs.versions.pmd.get()
   ignoreFailures true
   ruleSetConfig = resources.text.fromFile('config/pmd/ruleset.xml')
@@ -50 +20 @@
 
 // SonarQube config
-sonarqube {
+sonar {
   properties {
     property 'sonar.forceAuthentication', 'true'

applications/editors/josm/plugins/MicrosoftStreetside/gradle/wrapper/gradle-wrapper.properties

@@ -1 +1 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=740c2e472ee4326c33bf75a5c9f5cd1e69ecf3f9b580f6e236c86d1f3d98cfac
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists