Skip to content

Commit abfcea3

Browse files
committed
Merge changes from origin
1 parent 1c72ff7 commit abfcea3

File tree

6 files changed

+33
-36
lines changed

6 files changed

+33
-36
lines changed

.github/FUNDING.yml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ko_fi: shawnlin

README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
The android library that provides a simple and customizable NumberPicker.
44
It's based on [android.widget.NumberPicker](https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/widget/NumberPicker.java).
55

6-
[![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) [![CircleCI](https://circleci.com/gh/ShawnLin013/NumberPicker.svg?style=svg)](https://circleci.com/gh/ShawnLin013/NumberPicker)
6+
[![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) ![Maven Central](https://img.shields.io/maven-central/v/io.github.ShawnLin013/number-picker) [![CircleCI](https://circleci.com/gh/ShawnLin013/NumberPicker.svg?style=svg)](https://circleci.com/gh/ShawnLin013/NumberPicker)
7+
[![GitHub stars](https://img.shields.io/github/stars/ShawnLin013/NumberPicker)](https://github.com/ShawnLin013/NumberPicker/stargazers) [![GitHub forks](https://img.shields.io/github/forks/ShawnLin013/NumberPicker)](https://github.com/ShawnLin013/NumberPicker/network)
78

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

@@ -138,7 +139,7 @@ add `xmlns:app="http://schemas.android.com/apk/res-auto"`
138139

139140
### Attributes
140141

141-
|attribute name|attribute description|defalut|
142+
|attribute name|attribute description|default|
142143
|:---:|:---:|:---:|
143144
|np_width|The width of this widget.|
144145
|np_height|The height of this widget.|
@@ -183,12 +184,12 @@ Add the dependency in your `build.gradle`
183184
```gradle
184185
buildscript {
185186
repositories {
186-
jcenter()
187+
mavenCentral()
187188
}
188189
}
189190
190191
dependencies {
191-
implementation 'com.shawnlin:number-picker:2.4.12'
192+
implementation 'io.github.ShawnLin013:number-picker:2.4.13'
192193
}
193194
```
194195

gradle.properties

+22-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
1-
VERSION_CODE=20
2-
VERSION_NAME=2.4.12
1+
android.useAndroidX=true
2+
android.enableJetifier=true
3+
android.debug.obsoleteApi=true
34

4-
GROUP_ID=com.shawnlin
5-
ARTIFACT_ID=number-picker
5+
VERSION_CODE=21
6+
VERSION_NAME=2.4.13
67

8+
GROUP=io.github.ShawnLin013
9+
POM_ARTIFACT_ID=number-picker
10+
11+
POM_NAME=Number Picker
712
POM_DESCRIPTION=The android library that provides a simple and customizable NumberPicker.
13+
POM_INCEPTION_YEAR=2021
814
POM_URL=https://github.com/ShawnLin013/NumberPicker
9-
POM_LICENSE_NAME=MIT
10-
POM_LICENSE_URL=https://opensource.org/licenses/MIT
11-
POM_LICENSE_DIST=repo
12-
POM_DEVELOPER_ID=shawnlin013
13-
android.useAndroidX=true
14-
android.enableJetifier=true
15-
android.debug.obsoleteApi=true
15+
16+
POM_LICENCE_NAME=MIT
17+
POM_LICENCE_URL=https://opensource.org/licenses/MIT
18+
POM_LICENCE_DIST=repo
19+
20+
POM_SCM_URL=https://github.com/ShawnLin013/NumberPicker
21+
POM_SCM_CONNECTION=scm:[email protected]:ShawnLin013/NumberPicker.git
22+
POM_SCM_DEV_CONNECTION=scm:[email protected]:ShawnLin013/NumberPicker.git
23+
24+
POM_DEVELOPER_ID=ShawnLin013
25+
POM_DEVELOPER_NAME=Shawn Lin
26+
POM_DEVELOPER_URL=https://github.com/ShawnLin013/NumberPicker

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

library/build.gradle

+2-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apply plugin: 'com.android.library'
2-
apply plugin: "guru.stefma.bintrayrelease"
2+
apply plugin: 'com.vanniktech.maven.publish'
33

44
android {
55
compileSdkVersion 30
@@ -14,21 +14,5 @@ android {
1414

1515
dependencies {
1616
implementation fileTree(dir: 'libs', include: ['*.jar'])
17-
implementation 'androidx.appcompat:appcompat:1.2.0'
17+
implementation 'androidx.appcompat:appcompat:1.3.0'
1818
}
19-
20-
version = VERSION_NAME
21-
group = GROUP_ID
22-
androidArtifact {
23-
artifactId = ARTIFACT_ID
24-
license {
25-
name = POM_LICENSE_NAME
26-
url = POM_LICENSE_URL
27-
distribution = POM_LICENSE_DIST
28-
}
29-
}
30-
publish {
31-
userOrg = POM_DEVELOPER_ID
32-
desc = POM_DESCRIPTION
33-
website = POM_URL
34-
}

sample/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ android {
2020

2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation 'androidx.appcompat:appcompat:1.2.0'
24-
implementation 'com.google.android.material:material:1.3.0-alpha03'
23+
implementation 'androidx.appcompat:appcompat:1.3.0'
24+
implementation 'com.google.android.material:material:1.4.0-beta01'
2525
implementation project(':library')
2626
}

0 commit comments

Comments
 (0)