diff options
| author | Martin Fietz <Martin.Fietz@gmail.com> | 2015-11-08 13:27:43 +0100 |
|---|---|---|
| committer | Martin Fietz <Martin.Fietz@gmail.com> | 2015-11-08 13:44:15 +0100 |
| commit | 55df46ff6ab563ffbfe29c3ddf41cf7b806ed85a (patch) | |
| tree | efee09e7918ac29bc81028df05df407ad45860ac | |
| parent | ed9387e4206ef8cfa479d1694a592d92d96b29cf (diff) | |
| download | AntennaPod-55df46ff6ab563ffbfe29c3ddf41cf7b806ed85a.zip | |
Use local license and contributers files
| -rw-r--r-- | CONTRIBUTORS | 7 | ||||
| -rw-r--r-- | app/build.gradle | 11 | ||||
| -rw-r--r-- | app/src/main/assets/.gitignore | 2 | ||||
| -rw-r--r-- | app/src/main/assets/LICENSE.html | 17 | ||||
| -rw-r--r-- | app/src/main/assets/LICENSE_DSLV.txt | 16 | ||||
| -rw-r--r-- | app/src/main/templates/about.html | 7 |
6 files changed, 18 insertions, 42 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 939e2949b..2762b9fa5 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -72,8 +72,8 @@ Danish: CasperHN Dutch: e2jk, glotzbach English: mfietz, sterylmreep Finnish: danieloeh -French: cactux, ChaoticMind, clombion, e2jk, lacouture, mfietz, repat, sterylmreep, vcariven -German: altegedanken, ChaoticMind, Chaquotay, DJaeger, HolgerJeromin, kalei, lohmann, mfietz, nilso, picsel2, repat, SAPlayer, ypid +French: cactux, ChaoticMind, clombion, e2jk, lacouture, Matth78, mfietz, repat, sterylmreep, vcariven +German: altegedanken, bitsunited, ChaoticMind, Chaquotay, DJaeger, HolgerJeromin, kalei, lohmann, mfietz, nilso, picsel2, repat, SAPlayer, ypid Greek: AlexanderKanetakis Hebrew (Israel): amir.dafnyman Hindi (India): purple.coder, siddhusengar @@ -83,7 +83,8 @@ Italian: aalex70, Guybrush88, theloca95 Italian (Italy): aalex70, Guybrush88, m.chinni, theloca95 Japanese: Naofumi, sh3llc4t, TranslatorG Kannada (India): thejeshgn -Korean: changwoo, skcha +Korean: changwoo, seungrye, skcha +Korean (South Korea): seungrye Norwegian: timbast Norwegian Bokmål (Norway): kongk, swordfighter, timbast Polish: maniexx, thedead4fun diff --git a/app/build.gradle b/app/build.gradle index b13503d6f..3368af0d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -139,4 +139,13 @@ task filterAbout { } } -preBuild.dependsOn filterAbout +task copyTextFiles(type: Copy) { + from "../CONTRIBUTORS" + from "../LICENSE" + into "src/main/assets/" + rename { String fileName -> + fileName + ".txt" + } +} + +preBuild.dependsOn filterAbout, copyTextFiles diff --git a/app/src/main/assets/.gitignore b/app/src/main/assets/.gitignore index 328840cfc..f4de63f77 100644 --- a/app/src/main/assets/.gitignore +++ b/app/src/main/assets/.gitignore @@ -1,2 +1,4 @@ # this file is generated automatically about.html +LICENSE.txt +CONTRIBUTORS.txt diff --git a/app/src/main/assets/LICENSE.html b/app/src/main/assets/LICENSE.html deleted file mode 100644 index d38547791..000000000 --- a/app/src/main/assets/LICENSE.html +++ /dev/null @@ -1,17 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> - <title>MIT License</title> - </head> - <body> -<p>Copyright (c) 2012 Daniel Oeh</p> - -<p>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, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p> - -<p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p> - -</p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p> - - </body> -</html>
\ No newline at end of file diff --git a/app/src/main/assets/LICENSE_DSLV.txt b/app/src/main/assets/LICENSE_DSLV.txt deleted file mode 100644 index 2a2de04a3..000000000 --- a/app/src/main/assets/LICENSE_DSLV.txt +++ /dev/null @@ -1,16 +0,0 @@ -A subclass of the Android ListView component that enables drag -and drop re-ordering of list items. - -Copyright 2012 Carl Bauer - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/app/src/main/templates/about.html b/app/src/main/templates/about.html index a21ab4d33..21599bdb8 100644 --- a/app/src/main/templates/about.html +++ b/app/src/main/templates/about.html @@ -52,18 +52,15 @@ <p>Created by Daniel Oeh</p> - <p>Copyright © 2015 AntennaPod Contributors <a href="https://github.com/AntennaPod/AntennaPod/blob/master/CONTRIBUTORS">(View)</a></p> + <p>Copyright © 2015 AntennaPod Contributors <a href="CONTRIBUTORS.txt">(View)</a></p> - <p>Licensed under the MIT License <a href="LICENSE.html">(View)</a></p> + <p>Licensed under the MIT License <a href="LICENSE.txt">(View)</a></p> </div> <h1>Used libraries</h1> <h2>Apache Commons <a href="http://commons.apache.org/">(Link)</a></h2> by The Apache Software Foundation, licensed under the Apache 2.0 license <a href="LICENSE_APACHE_COMMONS.txt">(View)</a> -<h2>DragSortListView <a href="https://github.com/bauerca/drag-sort-listview">(Link)</a></h2> -by Carl Bauer, licensed under the Apache 2.0 license <a href="LICENSE_DSLV.txt">(View)</a> - <h2>EventBus <a href="https://github.com/greenrobot/EventBus">(Link)</a></h2> by greenrobot, licensed under the Apache 2.0 license <a href="LICENSE_EVENTBUS.txt">(View)</a> |