Skip to content

Commit

Permalink
update leaflet 1.0.3, to version 2.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
akuechl committed Apr 28, 2017
1 parent 14661bb commit 1efd38d
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 28 deletions.
2 changes: 1 addition & 1 deletion Osm_akuechler.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @package Joomla
* @copyright Copyright (C) 2011-2016 Ariel Küchler. All rights reserved.
* @copyright Copyright (C) 2011-2017 Ariel Küchler. All rights reserved.
* @license MIT License (http://opensource.org/licenses/mit-license copyright information see above) OR GPL-3.0 (http://opensource.org/licenses/gpl-3.0)
*/
defined ( '_JEXEC' ) or die ( 'Restricted access' );
Expand Down
7 changes: 6 additions & 1 deletion Osm_akuechler.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<extension version="2.5" type="plugin" group="content" method="upgrade">
<name>OSM Plugin</name>
<creationDate>Oct. 4th, 2016</creationDate>
<creationDate>April. 29th, 2017</creationDate>
<author>Ariel Küchler</author>
<authorUrl>https://github.com/admiralsmaster</authorUrl>
<copyright>Ariel Küchler</copyright>
Expand All @@ -14,6 +14,11 @@
<p>see <a href="https://github.com/admiralsmaster/osm_akuechler">https://github.com/admiralsmaster/osm_akuechler</a></p>
<h2>Versions</h2>
<ol>
<li>2.4.0
<ul>
<li>leafletjs upgrade to <a href="https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md#103-january-23-2017">1.0.3</a></li>
</ul>
</li>
<li>2.3.0
<ul>
<li>leafletjs upgrade to <a href="https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md#101-september-30-2016">1.0.1</a></li>
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ height | The height of DIV is the height of the card. Set the height via CSS,
Version
--------------

* **Version 2.4.0**: (April 29th, 2017) update leafletjs to 1.0.3
* **Version 2.3.0**: (Oct 4th, 2016) update leafletjs to 1.0.1
* **Version 2.2.0**: (Sep 27, 2016) update leafletjs to 1.0.0
* **Version 2.1.0**: (Dec 1, 2015) update leafletjs to 0.7.7
Expand Down
16 changes: 14 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project name="" default="all" basedir=".">

<property name="version" value="2.3.0" />
<property name="leaflet-version" value="1.0.1" />
<property name="version" value="2.4.0" />
<property name="leaflet-version" value="1.0.3" />
<property name="pluginname" value="Osm_akuechler" />
<property name="dwn-folder" value="downloads" />
<property name="dist-folder" value="dist" />
Expand Down Expand Up @@ -52,6 +52,13 @@
</patternset>
<cutdirsmapper dirs="6" />
</unjar>
<unjar src="${dwn-folder}/leaflet.jar" dest="${dist-folder}/">
<patternset>
<include name="META-INF/resources/webjars/leaflet/*/LICENSE"/>
</patternset>
<cutdirsmapper dirs="5" />
</unjar>
<move file="${dist-folder}/LICENSE" tofile="${dist-folder}/leaflet-license" />
<copy todir="${build-folder}">
<fileset dir="${dist-folder}">
<include name="leaflet/**" />
Expand All @@ -65,6 +72,11 @@
<include name="index.html" />
</fileset>
</copy>
<copy todir="${build-folder}/licenses">
<fileset dir="${dist-folder}">
<include name="leaflet-license"/>
</fileset>
</copy>
<replace file="${build-folder}/${pluginname}.xml" token="@version@" value="${version}" />
<replace file="${build-folder}/${pluginname}.php" token="@leaflet-version@" value="${leaflet-version}" />
<java fork="true" jar="${dwn-folder}/yuicompressor.jar">
Expand Down
2 changes: 1 addition & 1 deletion licenses/MIT-License
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2012-2016 Ariel Küchler
Copyright (c) 2012-2017 Ariel Küchler

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
associated documentation files (the "Software"), to deal in the Software without restriction,
Expand Down
23 changes: 0 additions & 23 deletions licenses/leaflet-license

This file was deleted.

0 comments on commit 1efd38d

Please sign in to comment.