Changeset 36228 in osm for applications/editors/josm/plugins/MicrosoftStreetside/build.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.

File:

• applications/editors/josm/plugins/MicrosoftStreetside/build.gradle (modified) (6 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/build.gradle

@@ +1 @@
+import com.github.spotbugs.snom.Confidence
+import com.github.spotbugs.snom.Effort
 import com.github.spotbugs.snom.SpotBugsTask
-import net.ltgt.gradle.errorprone.CheckSeverity
+import org.gradle.api.tasks.testing.logging.TestLogEvent
 
 plugins {
@@ -7 +9 @@
   id 'jacoco'
   id 'pmd'
-  id("com.github.ben-manes.versions").version("0.49.0")
-  id("net.ltgt.errorprone").version("3.1.0")
-  id("org.kordamp.markdown.convert").version("1.2.0")
-  id("org.sonarqube").version("3.3")
-  id('com.github.spotbugs').version('5.2.3')
-  id('org.openstreetmap.josm').version("0.8.2")
-  id("com.diffplug.spotless").version("6.22.0")
+  alias(libs.plugins.spotless)
+  alias(libs.plugins.versions)
+  alias(libs.plugins.errorprone)
+  alias(libs.plugins.markdown)
+  alias(libs.plugins.javafx)
+  alias(libs.plugins.sonarqube)
+  alias(libs.plugins.spotbugs)
+  alias(libs.plugins.josm)
 }
 
@@ -21 +24 @@
 //apply from: 'gradle/markdown.gradle'
 
-sourceCompatibility = '1.8'
+sourceCompatibility = '21'
 
 def versionProcess = new ProcessBuilder("git", "describe", "--always", "--dirty").start()
@@ -40 +43 @@
 }
 
-def versions = [
-  awaitility: "4.2.0",
-  jmockit: "1.49.a",
-  junit: "5.10.1",
-  wiremock: "2.27.2"
-]
+javafx {
+    modules = [ 'javafx.graphics', 'javafx.controls', 'javafx.swing' ]
+}
 
 dependencies {
-  if (!JavaVersion.current().isJava9Compatible()) {
-    errorproneJavac("com.google.errorprone:javac:9+181-r4173-1")
-  }
-  testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}")
-  testImplementation("org.junit.jupiter:junit-jupiter-params:${versions.junit}")
-  testImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}")
-  testImplementation("org.junit.vintage:junit-vintage-engine:${versions.junit}")
-  testImplementation ("org.openstreetmap.josm:josm-unittest"){changing=true}
-  testImplementation "com.github.tomakehurst:wiremock:${versions.wiremock}"
-  testImplementation("org.jmockit:jmockit:${versions.jmockit}")
-  testImplementation("org.awaitility:awaitility:${versions.awaitility}")
+  errorprone(libs.errorprone)
+  spotbugsPlugins(libs.findsecbugsPlugin)
+  testRuntimeOnly libs.junit.jupiter.engine
+  testImplementation libs.bundles.junit
+  testImplementation libs.josm.unittest
+  testImplementation libs.wiremock
+  testImplementation libs.jmockit
+  testImplementation libs.awaitility
 }
 
@@ -82 +79 @@
     }
   }
+}
+
+// Spotbugs config
+spotbugs {
+    toolVersion = libs.versions.spotbugs.get()
+    ignoreFailures = true
+    effort = Effort.valueOf('MAX')
+    reportLevel = Confidence.valueOf('LOW')
+    //sourceSets = [sourceSets.main, sourceSets.test]
 }
 
@@ -133 +139 @@
 }
 
-import org.gradle.api.tasks.testing.logging.TestLogEvent
-
 test {
   project.afterEvaluate {