From 5cd451ab1ae6bd118ed6142ebd345d4eca7741c4 Mon Sep 17 00:00:00 2001 From: Shawn Date: Sat, 27 Jan 2018 01:37:00 +0800 Subject: [PATCH 1/2] Update License --- LICENSE | 9 +++++++++ README.md | 18 ++---------------- gradle.properties | 4 ++-- 3 files changed, 13 insertions(+), 18 deletions(-) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..497675f --- /dev/null +++ b/LICENSE @@ -0,0 +1,9 @@ +The MIT License (MIT) + +Copyright (c) 2018 ShawnLin013 + +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: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +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. \ No newline at end of file diff --git a/README.md b/README.md index cb29b8e..61b84f6 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ The android library that provides a simple and customizable NumberPicker. It's based on [android.widget.NumberPicker](https://android.googlesource.com/platform/frameworks/base/+/47fb191/core/java/android/widget/NumberPicker.java). -[![Platform](http://img.shields.io/badge/platform-android-brightgreen.svg?style=flat)](http://developer.android.com/index.html) [![Language](http://img.shields.io/badge/language-java-orange.svg?style=flat)](http://www.oracle.com/technetwork/java/javase/downloads/index.html) [![License](http://img.shields.io/badge/license-apache2.0-lightgrey.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-NumberPicker-green.svg?style=true)](https://android-arsenal.com/details/1/3718) [![API](https://img.shields.io/badge/API-15%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=15) [![Download](https://api.bintray.com/packages/shawnlin013/maven/number-picker/images/download.svg)](https://bintray.com/shawnlin013/maven/number-picker/_latestVersion) +[![Platform](http://img.shields.io/badge/platform-android-brightgreen.svg?style=flat)](http://developer.android.com/index.html) [![Language](http://img.shields.io/badge/language-java-orange.svg?style=flat)](http://www.oracle.com/technetwork/java/javase/downloads/index.html) [![](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-NumberPicker-green.svg?style=true)](https://android-arsenal.com/details/1/3718) [![API](https://img.shields.io/badge/API-15%2B-blue.svg?style=flat)](https://android-arsenal.com/api?level=15) [![Download](https://api.bintray.com/packages/shawnlin013/maven/number-picker/images/download.svg)](https://bintray.com/shawnlin013/maven/number-picker/_latestVersion) @@ -159,18 +159,4 @@ dependencies { ## License -``` -Copyright (C) 2016 ShawnLin013(Shawn Lin) - -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. -``` +The source code is licensed under the [MIT](License) license. diff --git a/gradle.properties b/gradle.properties index d5f6af6..676e0fc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,8 +7,8 @@ ARTIFACT_ID=number-picker POM_DESCRIPTION=The android library that provides a simple and customizable NumberPicker. POM_URL=https://github.com/ShawnLin013/NumberPicker POM_SCM_URL=git@github.com:ShawnLin013/NumberPicker.git -POM_LICENSE_NAME=The Apache Software License, Version 2.0 -POM_LICENSE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENSE_NAME=MIT +POM_LICENSE_URL=https://opensource.org/licenses/MIT POM_LICENSE_DIST=repo POM_DEVELOPER_ID=shawnlin013 POM_DEVELOPER_NAME=shawnlin013 From b4ddad1e1b697ab818f4864676ef49955f723975 Mon Sep 17 00:00:00 2001 From: Shawn Date: Sat, 27 Jan 2018 01:48:53 +0800 Subject: [PATCH 2/2] :bookmark: v2.4.5 --- README.md | 2 +- gradle.properties | 13 ++++--------- library/build.gradle | 6 ++---- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 61b84f6..08a7c09 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,7 @@ buildscript { } dependencies { - compile 'com.shawnlin:number-picker:2.4.4' + compile 'com.shawnlin:number-picker:2.4.5' } ``` diff --git a/gradle.properties b/gradle.properties index 676e0fc..a206c71 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,16 +1,11 @@ -VERSION_CODE=12 -VERSION_NAME=2.4.4 +VERSION_CODE=13 +VERSION_NAME=2.4.5 -GROUP=com.shawnlin +GROUP_ID=com.shawnlin ARTIFACT_ID=number-picker POM_DESCRIPTION=The android library that provides a simple and customizable NumberPicker. POM_URL=https://github.com/ShawnLin013/NumberPicker -POM_SCM_URL=git@github.com:ShawnLin013/NumberPicker.git POM_LICENSE_NAME=MIT -POM_LICENSE_URL=https://opensource.org/licenses/MIT POM_LICENSE_DIST=repo -POM_DEVELOPER_ID=shawnlin013 -POM_DEVELOPER_NAME=shawnlin013 -POM_DEVELOPER_EMAIL=hn62257@gmail.com -ISSUE_URL=https://github.com/ShawnLin013/NumberPicker/issues \ No newline at end of file +POM_DEVELOPER_ID=shawnlin013 \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index b94562f..7b8ca37 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -20,14 +20,12 @@ dependencies { publish { userOrg = POM_DEVELOPER_ID - groupId = GROUP + groupId = GROUP_ID artifactId = ARTIFACT_ID publishVersion = VERSION_NAME - licences = ['Apache-2.0'] + licences = [POM_LICENSE_NAME] desc = POM_DESCRIPTION website = POM_URL - issueTracker = ISSUE_URL - repository = POM_SCM_URL autoPublish = false dryRun = false } \ No newline at end of file