Allow failure on minJosm compilation, and update the minimum compile version

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>
pull/1/head
Taylor Smock 2019-12-23 08:55:35 -07:00
rodzic d9a36b5576
commit 998a6471c4
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 625F6A74A3E4311A
3 zmienionych plików z 8 dodań i 4 usunięć

Wyświetl plik

@ -112,6 +112,7 @@ compile against min JOSM:
- ./gradlew compileJava_minJosm
dependencies:
- assemble
allow_failure: true
compile against latest JOSM:
stage: test

Wyświetl plik

@ -3,7 +3,7 @@ plugin.main.version = 15542
# The JOSM version this plugin is currently compiled against
# Please make sure this version is available at https://josm.openstreetmap.de/download
# The special values "latest" and "tested" are also possible here, but not recommended.
plugin.compile.version = 15542
plugin.compile.version = 15603
plugin.canloadatruntime = true
plugin.author = Taylor Smock <incoming+gokaart/JOSM_MapWithAI@incoming.gitlab.com>
plugin.class = org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin

Wyświetl plik

@ -80,7 +80,9 @@ public final class MapWithAIPlugin extends Plugin implements Destroyable {
}
}
OsmValidator.addTest(RoutingIslandsTest.class);
if (!OsmValidator.getAllAvailableTestClasses().contains(RoutingIslandsTest.class)) {
OsmValidator.addTest(RoutingIslandsTest.class);
}
if (!Config.getPref().getKeySet().contains(PAINTSTYLE_PREEXISTS)) {
Config.getPref().putBoolean(PAINTSTYLE_PREEXISTS, MapWithAIDataUtils.checkIfMapWithAIPaintStyleExists());
@ -157,8 +159,9 @@ public final class MapWithAIPlugin extends Plugin implements Destroyable {
}
destroyables.forEach(Destroyable::destroy);
if (Version.getInstance().getVersion() > 15542) {
DownloadDialog.removeDownloadSource(mapWithAIDownloadReader);
DownloadDialog.removeDownloadSource(mapWithAIDownloadReader);
if (Version.getInstance().getVersion() >= 15603) {
OsmValidator.removeTest(RoutingIslandsTest.class);
}
}
}