Skip to content

Commit 517d436

Browse files
committed
Merge changes from origin and fix jitpack
1 parent 1c72ff7 commit 517d436

File tree

9 files changed

+68
-49
lines changed

9 files changed

+68
-49
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

build.gradle

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.0.2'
10-
classpath "guru.stefma.bintrayrelease:bintrayrelease:1.1.2"
11-
// NOTE: Do not place your application dependencies here; they belong
12-
// in the individual module build.gradle files
9+
classpath 'com.android.tools.build:gradle:8.2.2'
10+
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0'
1311
}
1412
}
1513

1614
allprojects {
1715
repositories {
1816
google()
1917
mavenCentral()
18+
maven { url "https://jitpack.io" }
2019
}
2120
}
2221

gradle.properties

+23-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
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
12+
POM_PACKAGING=aar
713
POM_DESCRIPTION=The android library that provides a simple and customizable NumberPicker.
14+
POM_INCEPTION_YEAR=2021
815
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
16+
17+
POM_LICENCE_NAME=MIT
18+
POM_LICENCE_URL=https://opensource.org/licenses/MIT
19+
POM_LICENCE_DIST=repo
20+
21+
POM_SCM_URL=https://github.com/ShawnLin013/NumberPicker
22+
POM_SCM_CONNECTION=scm:[email protected]:ShawnLin013/NumberPicker.git
23+
POM_SCM_DEV_CONNECTION=scm:[email protected]:ShawnLin013/NumberPicker.git
24+
25+
POM_DEVELOPER_ID=ShawnLin013
26+
POM_DEVELOPER_NAME=Shawn Lin
27+
POM_DEVELOPER_URL=https://github.com/ShawnLin013/NumberPicker
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Jun 13 03:38:47 CST 2020
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

library/build.gradle

+26-19
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,41 @@
1-
apply plugin: 'com.android.library'
2-
apply plugin: "guru.stefma.bintrayrelease"
1+
plugins {
2+
id 'com.vanniktech.maven.publish'
3+
id 'com.android.library'
4+
}
35

46
android {
5-
compileSdkVersion 30
6-
77
defaultConfig {
8+
compileSdk 34
89
minSdkVersion 15
9-
targetSdkVersion 30
10+
targetSdkVersion 34
1011
versionCode VERSION_CODE as int
1112
versionName VERSION_NAME
1213
}
14+
15+
compileOptions {
16+
sourceCompatibility JavaVersion.VERSION_17
17+
targetCompatibility JavaVersion.VERSION_17
18+
}
19+
20+
namespace 'com.shawnlin.numberpicker'
1321
}
1422

1523
dependencies {
1624
implementation fileTree(dir: 'libs', include: ['*.jar'])
17-
implementation 'androidx.appcompat:appcompat:1.2.0'
25+
implementation 'androidx.appcompat:appcompat:1.3.0'
1826
}
1927

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+
publishing {
29+
publications {
30+
myMaven(MavenPublication) {
31+
groupId GROUP
32+
artifactId POM_ARTIFACT_ID
33+
version VERSION_NAME
34+
artifact("$buildDir/outputs/aar/library-release.aar")
35+
}
2836
}
2937
}
30-
publish {
31-
userOrg = POM_DEVELOPER_ID
32-
desc = POM_DESCRIPTION
33-
website = POM_URL
34-
}
38+
39+
tasks.named("publishMyMavenPublicationToMavenLocal") {
40+
dependsOn tasks.named("bundleReleaseAar")
41+
}

library/src/main/AndroidManifest.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
<manifest package="com.shawnlin.numberpicker"
2-
xmlns:android="http://schemas.android.com/apk/res/android">
3-
</manifest>
1+
<manifest />

sample/build.gradle

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 30
5-
64
defaultConfig {
75
applicationId "com.shawnlin.numberpicker.sample"
6+
compileSdk 34
87
minSdkVersion 15
9-
targetSdkVersion 30
8+
targetSdkVersion 34
109
versionCode 1
1110
versionName "1.0"
1211
}
@@ -16,11 +15,13 @@ android {
1615
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1716
}
1817
}
18+
19+
namespace 'com.shawnlin.numberpicker.sample'
1920
}
2021

2122
dependencies {
2223
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'
24+
implementation 'androidx.appcompat:appcompat:1.3.0'
25+
implementation 'com.google.android.material:material:1.4.0-beta01'
2526
implementation project(':library')
2627
}

sample/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.shawnlin.numberpicker.sample"
2+
<manifest
33
xmlns:android="http://schemas.android.com/apk/res/android">
44

55
<application
@@ -10,6 +10,7 @@
1010
android:theme="@style/AppTheme">
1111
<activity
1212
android:name=".MainActivity"
13+
android:exported="true"
1314
android:label="@string/app_name"
1415
android:screenOrientation="portrait"
1516
android:theme="@style/AppTheme.NoActionBar">

0 commit comments

Comments
 (0)