Skip to content

Commit

Permalink
Merge pull request #91 from ShawnLin013/feature/Bump-v2.4.5
Browse files Browse the repository at this point in the history
Feature/bump v2.4.5
  • Loading branch information
ShawnLin013 authored Jan 26, 2018
2 parents 7f5bc98 + b4ddad1 commit d77c329
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 31 deletions.
9 changes: 9 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -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.
20 changes: 3 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

<img src="https://github.com/ShawnLin013/NumberPicker/blob/master/screenshot/number-picker-theme.png">

Expand Down Expand Up @@ -153,24 +153,10 @@ buildscript {
}
dependencies {
compile 'com.shawnlin:number-picker:2.4.4'
compile 'com.shawnlin:number-picker:2.4.5'
}
```

## 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.
15 changes: 5 additions & 10 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -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[email protected]: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_DIST=repo
POM_DEVELOPER_ID=shawnlin013
POM_DEVELOPER_NAME=shawnlin013
POM_DEVELOPER_EMAIL[email protected]
ISSUE_URL=https://github.com/ShawnLin013/NumberPicker/issues
POM_DEVELOPER_ID=shawnlin013
6 changes: 2 additions & 4 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit d77c329

Please sign in to comment.