Index: native/snapcraft.yaml
===================================================================
--- native/snapcraft.yaml	(revision 18705)
+++ native/snapcraft.yaml	(working copy)
@@ -15,33 +15,41 @@
  from using them in creative, productive or unexpected ways.
 confinement: strict
 grade: devel
-icon: native/linux/tested/usr/share/icons/hicolor/128x128/apps/josm.png
+icon: native/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
+base: core18
 
 apps:
  josm:
    command: josm-launch
-   desktop: josm.desktop
-   plugs: [unity7, network, home]
+   desktop: org.openstreetmap.josm.desktop
+   plugs: [network, home]
+   environment:
+     # Ensure font-config is happy
+     XDG_DATA_HOME: $SNAP/usr/share
+     FONTCONFIG_PATH: $SNAP/etc/fonts/config.d
+     FONTCONFIG_FILE: $SNAP/etc/fonts/fonts.conf
+     HOME: $SNAP_USER_DATA
+     # Ensure java is happy as well
+     JRE_HOME: $SNAP/usr/lib/jvm/default-java/jre
+     JAVA_HOME: $SNAP/usr/lib/jvm/default-java/jre
+     PATH: $JAVA_HOME/jre/bin:$PATH
+     # Set up the variables for the JOSM start script
+     JOSM_PATH: $SNAP/josm-custom.jar
+     JAVA_OPTS: -Duser.home=$SNAP_USER_DATA
 
 parts:
-    local:
-        plugin: ant
-        ant-properties:
-            dist.dir: $SNAPCRAFT_PART_INSTALL
-        source: .
-        install: |
-            cp -a native/linux/tested/usr/share/applications/josm.desktop $SNAPCRAFT_PART_INSTALL/
-            cat<<'EOF' > $SNAPCRAFT_PART_INSTALL/josm-launch
-            #!/bin/sh
-            # ensure font-config is happy
-            export XDG_DATA_HOME=$SNAP/usr/share
-            export FONTCONFIG_PATH=$SNAP/etc/fonts/config.d
-            export FONTCONFIG_FILE=$SNAP/etc/fonts/fonts.conf
-            export HOME=$SNAP_USER_DATA
-            # ensure java is happy as well
-            export JRE_HOME=$SNAP/usr/lib/jvm/default-java/jre
-            export JAVA_HOME=$SNAP/usr/lib/jvm/default-java/jre
-            java -Duser.home=$SNAP_USER_DATA -jar $SNAP/josm-custom.jar
-            EOF
-            chmod +x $SNAPCRAFT_PART_INSTALL/josm-launch
-          
+  josm:
+    plugin: ant
+    ant-properties:
+      dist.dir: $SNAPCRAFT_PART_INSTALL
+    source: .
+    ant-build-targets:
+      - clean
+      - dist
+    override-build: |
+      snapcraftctl build
+      cp -a project/native/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop $SNAPCRAFT_PART_INSTALL/
+      cp -a project/native/linux/tested/usr/bin/josm $SNAPCRAFT_PART_INSTALL/josm-launch
+    build-packages:
+      - subversion
+      - git