From 99994d6ee17851c3c19f20ab5347e53ad59b4553 Mon Sep 17 00:00:00 2001 From: tateisu Date: Sat, 21 Apr 2018 16:09:05 +0900 Subject: [PATCH] bump version, remove unused library from oss license text --- app/build.gradle | 4 ++-- app/src/main/res/raw/oss_license.txt | 18 ------------------ 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a0bb69e7..3c852559 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { minSdkVersion 21 targetSdkVersion 27 - versionCode 241 - versionName "2.4.1" + versionCode 242 + versionName "2.4.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" // https://stackoverflow.com/questions/47791227/java-lang-illegalstateexception-dex-archives-setting-dex-extension-only-for diff --git a/app/src/main/res/raw/oss_license.txt b/app/src/main/res/raw/oss_license.txt index 17ede310..3104f2fd 100644 --- a/app/src/main/res/raw/oss_license.txt +++ b/app/src/main/res/raw/oss_license.txt @@ -221,24 +221,6 @@ 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. -==================================================== -aellerton/japng -https://github.com/aellerton/japng - -Copyright 2015 A. Ellerton - -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. - ==================================================== iamcal/emoji-data https://github.com/iamcal/emoji-data