Mirrors
/
xmrwallet
mirror of https://github.com/m2049r/xmrwallet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct license infos (#64) 

and some .idea files

* corrected license info
This commit is contained in:
m2049r 2017-09-12 22:02:31 +02:00 committed by GitHub
parent 862716406e
commit 7be001bd85
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -43,7 +43,6 @@ dependencies {
compile 'com.android.support:cardview-v7:25.4.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'me.dm7.barcodescanner:zxing:1.9.8'
compile('de.psdev.licensesdialog:licensesdialog:1.8.3')
}
dependencyVerification {
@ -55,7 +54,6 @@ dependencyVerification {
'com.android.support:cardview-v7:f3fbbe1fcfdbec7333c6a2c516c5fd511a909d1975271818e268d6fe297d8c70',
'com.android.support.constraint:constraint-layout:b0c688cc2b7172608f8153a689d746da40f71e52d7e2fe2bfd9df2f92db77085',
'me.dm7.barcodescanner:zxing:d43973c9527c23fa8e6d338c6a2c458e373ce1ac6bcaa3bc41d11ae49116000d',
'de.psdev.licensesdialog:licensesdialog:ac6e0be89323b993eb7c732a882278f2cb08c4e525062affa1bc4a1344e4ecf3',
'com.android.support:support-annotations:a774272036941b4e912eb426d70c848bde7f06a3bf5fb491f75a427dc6595270',
'com.android.support:support-vector-drawable:077009d13882ee96f061e4bc2dbe7cce7ae1762d8297592a787ff741afbfb1f2',
'com.android.support:animated-vector-drawable:628ab1d56a6ee4cbedf32617af8b2a1fe02964ed0628e8f898cc09ddba6e1835',
@ -68,6 +66,5 @@ dependencyVerification {
'com.android.support.constraint:constraint-layout-solver:8c62525a9bc5cff5633a96cb9b32fffeccaf41b8841aa87fc22607070dea9b8d',
'me.dm7.barcodescanner:core:a5c8a704089b58029db166172ed8e55d756877d010a85a0b1c94fdc96ffb8f9a',
'com.google.zxing:core:bba7724e02a997cec38213af77133ee8e24b0d5cf5fa7ecbc16a4fa93f11ee0d',
'com.google.code.findbugs:jsr305:c885ce34249682bc0236b4a7d56efcc12048e6135a5baf7a9cde8ad8cda13fcd',
]
}

37
app/src/main/res/raw/licenses.html
View File

@ -8,7 +8,7 @@
<body>
<h1>Open Source Licenses</h1>
<h2>Licensed under the Apache License, Version 2.0</h2>
<h3>Copyright (c) 2011 The Android Open Source Project</h3>
<h3>Copyright (c) The Android Open Source Project</h3>
<ul>
<li>com.android.support:design</li>
<li>com.android.support:support-v4</li>
@ -38,7 +38,7 @@
</ul>
<h3>Copyright (c) 2013 Adam Speakman</h3>
<ul>
<li>de.psdev.licensesdialog:licensesdialog</li>
<li>https://github.com/adamsp/AndroidLicensesPage</li>
</ul>
<h2>Apache License
@ -215,38 +215,5 @@
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.<br/>
<h2>Licensed under the 3-Clause BSD License</h2>
<h3>Copyright (c) 2007-2009, JSR305 expert group</h3>
<ul>
<li>com.google.code.findbugs:jsr305</li>
</ul>
<h2>The 3-Clause BSD License</h2>
SPDX short identifier: BSD-3-Clause<br/>
https://opensource.org/licenses/BSD-3-Clause<br/>
<br/>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:<br/>
<br/>
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.<br/>
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.<br/>
* Neither the name of the JSR305 expert group nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.<br/>
<br/>
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE.<br/>
</body>
</html>