Skip to content

Commit aeb65f8

Browse files
committed
See #24091: Drop gradle from JOSM maintained plugins
Signed-off-by: Taylor Smock <tsmock@meta.com>
1 parent 1c452ea commit aeb65f8

File tree

10 files changed

+246
-452
lines changed

10 files changed

+246
-452
lines changed

.github/workflows/ant.yml

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,45 @@ on:
1212
- $default-branch
1313
workflow_dispatch:
1414

15+
permissions:
16+
id-token: write
17+
attestations: write
18+
contents: write
19+
packages: write
20+
1521
jobs:
22+
check-release-needed:
23+
runs-on: ubuntu-latest
24+
outputs:
25+
release_needed: ${{ steps.create_release_needed.outputs.release_needed }}
26+
steps:
27+
- name: Checkout
28+
uses: actions/checkout@v4
29+
with:
30+
fetch-depth: ${{ (github.repository == 'JOSM/pt_assistant' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'schedule' && github.event_name != 'pull_request') && '0' || '1' }}
31+
32+
- name: Set release needed
33+
id: create_release_needed
34+
run: |
35+
last_tag=$(git describe --tags --abbrev=0 --always)
36+
release_needed="false"
37+
for file in $(git diff ${last_tag}..HEAD --name-only); do
38+
if [[ $file = "src/"* ]] || [[ $file = "data/"* ]] || [[ $file = "lib/"* ]] || [[ $file = "resources/"* ]] || [[ $file = "images/"* ]]; then
39+
release_needed="true"
40+
break
41+
fi
42+
done
43+
echo "release_needed=$release_needed" >> $GITHUB_OUTPUT
44+
45+
1646
call-workflow:
47+
needs: check-release-needed
1748
strategy:
1849
matrix:
19-
josm-revision: ["", "r18877"]
20-
uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v2
50+
josm-revision: ["", "r19044"]
51+
uses: JOSM/JOSMPluginAction/.github/workflows/ant.yml@v3
2152
with:
2253
josm-revision: ${{ matrix.josm-revision }}
23-
perform-revision-tagging: ${{ github.repository == 'JOSM/pt_assistant' && github.ref_type == 'branch' && github.ref_name == 'master' && github.event_name != 'pull_request' && matrix.josm-revision == 'r18877' }}
54+
perform-revision-tagging: ${{ matrix.josm-revision == 'r19044' && needs.check-release-needed.outputs.release_needed == 'true' }}
2455
secrets: inherit
2556

.github/workflows/reports.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

build.gradle.kts

Lines changed: 0 additions & 83 deletions
This file was deleted.

build.xml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<project name="pt_assistant" default="dist" basedir=".">
33
<property name="plugin.src.dir" value="src/main/java"/>
4-
5-
<!-- edit the properties of this plugin in the file `gradle.properties` -->
6-
<property file="${basedir}/gradle.properties"/>
7-
4+
<property name="plugin.author" value="Biswesh Mohapatra &lt;biswesh123@gmail.com&gt;, simon04, Rodion Scherbakov"/>
5+
<property name="plugin.class" value="org.openstreetmap.josm.plugins.pt_assistant.PTAssistantPlugin"/>
6+
<property name="plugin.description" value="Provides validation and fixing for public transport route according to version 2 of the public transport schema"/>
7+
<property name="plugin.link" value="https://wiki.openstreetmap.org/wiki/JOSM/Plugins/PT_Assistant"/>
8+
<property name="plugin.canloadatruntime" value="true"/>
9+
<property name="plugin.icon" value="images/bus.svg"/>
10+
<property name="plugin.main.version" value="19044"/>
811
<!-- ** include targets that all plugins have in common ** -->
912
<import file="../build-common.xml"/>
10-
1113
<!-- Override the `setup-dist-default` task from build-common.xml -->
1214
<target name="setup-dist-default">
1315
<copy todir="${plugin.build.dir}" failonerror="no" includeemptydirs="no">
@@ -23,10 +25,11 @@
2325
</target>
2426
<target name="additional-manifest">
2527
<manifest file="MANIFEST" mode="update">
26-
<attribute name="13957_Plugin-Url" value="v2.0.0;https://github.com/JOSM/pt_assistant/releases/download/v2.0.0/pt_assistant.jar" />
27-
<attribute name="14027_Plugin-Url" value="v2.1.4;https://github.com/JOSM/pt_assistant/releases/download/v2.1.4/pt_assistant.jar" />
28-
<attribute name="14149_Plugin-Url" value="v2.1.6;https://github.com/JOSM/pt_assistant/releases/download/v2.1.6/pt_assistant.jar" />
29-
<attribute name="17903_Plugin-Url" value="v2.1.15;https://github.com/JOSM/pt_assistant/releases/download/v2.1.15/pt_assistant.jar" />
28+
<attribute name="13957_Plugin-Url" value="v2.0.0;https://github.com/JOSM/pt_assistant/releases/download/v2.0.0/pt_assistant.jar"/>
29+
<attribute name="14027_Plugin-Url" value="v2.1.4;https://github.com/JOSM/pt_assistant/releases/download/v2.1.4/pt_assistant.jar"/>
30+
<attribute name="14149_Plugin-Url" value="v2.1.6;https://github.com/JOSM/pt_assistant/releases/download/v2.1.6/pt_assistant.jar"/>
31+
<attribute name="17903_Plugin-Url" value="v2.1.15;https://github.com/JOSM/pt_assistant/releases/download/v2.1.15/pt_assistant.jar"/>
32+
<attribute name="18877_Plugin-Url" value="v631;https://github.com/JOSM/pt_assistant/releases/download/v631/pt_assistant.jar"/>
3033
</manifest>
3134
</target>
3235
</project>

gradle.properties

Lines changed: 0 additions & 15 deletions
This file was deleted.

gradle/wrapper/gradle-wrapper.jar

-58.4 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)