kopia lustrzana https://github.com/JOSM/MapWithAI
Set Java compile version to 17
Signed-off-by: Taylor Smock <tsmock@meta.com>pull/26/head
rodzic
f116697f81
commit
e881d586f6
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
|
|
|
@ -21,6 +21,7 @@ jobs:
|
|||
josm-revision: ["", "r18589"]
|
||||
uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v1
|
||||
with:
|
||||
java-version: 17
|
||||
josm-revision: ${{ matrix.josm-revision }}
|
||||
plugin-jar-name: 'mapwithai'
|
||||
perform-revision-tagging: ${{ github.repository == 'JOSM/MapWithAI' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'schedule' && github.event_name != 'pull_request' && matrix.josm-revision == 'r18589' }}
|
||||
|
|
|
@ -30,8 +30,7 @@ repositories {
|
|||
def versions = [
|
||||
awaitility: "4.2.0",
|
||||
equalsverifier: "3.15",
|
||||
// Errorprone 2.11 requires Java 11+
|
||||
errorprone: (JavaVersion.toVersion(getJavaVersion()) >= JavaVersion.VERSION_11) ? "2.20.0" : "2.10.0",
|
||||
errorprone: "2.20.0",
|
||||
findsecbugs: "1.12.0",
|
||||
jacoco: "0.8.7",
|
||||
jmockit: "1.49.a",
|
||||
|
@ -77,7 +76,7 @@ int getJavaVersion() {
|
|||
if (ci) {
|
||||
return Integer.valueOf(JavaVersion.current().getMajorVersion())
|
||||
}
|
||||
return 8
|
||||
return 17
|
||||
}
|
||||
|
||||
logger.lifecycle("Using Java " + getJavaVersion())
|
||||
|
@ -212,6 +211,7 @@ spotless {
|
|||
josm {
|
||||
debugPort = 7055
|
||||
manifest {
|
||||
setMinJavaVersion 17
|
||||
oldVersionDownloadLink 18218, "v1.9.20", new URL("https://github.com/JOSM/MapWithAI/releases/download/v1.9.20/mapwithai.jar")
|
||||
oldVersionDownloadLink 17903, "v1.8.7", new URL("https://github.com/JOSM/MapWithAI/releases/download/v1.8.7/mapwithai.jar")
|
||||
oldVersionDownloadLink 17084, "v1.7.1.6", new URL("https://github.com/JOSM/MapWithAI/releases/download/v1.7.1.6/mapwithai.jar")
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
<!-- edit the properties of this plugin in the file `gradle.properties` -->
|
||||
<property file="${basedir}/gradle.properties"/>
|
||||
<property name="java.lang.version" value="17"/>
|
||||
|
||||
<!-- ** include targets that all plugins have in common ** -->
|
||||
<import file="../build-common.xml"/>
|
||||
|
|
|
@ -9,6 +9,7 @@ plugin.author = Taylor Smock
|
|||
plugin.class = org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin
|
||||
plugin.icon = images/dialogs/mapwithai.svg
|
||||
plugin.link = https://github.com/JOSM/MapWithAI
|
||||
plugin.minimum.java.version = 17
|
||||
plugin.description = Allows the use of MapWithAI data in JOSM (same data as used in RapiD)
|
||||
|
||||
plugin.requires = utilsplugin2;apache-http
|
||||
|
|
Ładowanie…
Reference in New Issue