Skip to content

Commit 61cc34a

Browse files
author
wsc
committed
上传发布 V3.0.0-alpha 版本,
1 parent 8ce6e3e commit 61cc34a

File tree

19 files changed

+135
-123
lines changed

19 files changed

+135
-123
lines changed

README.md

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![License](https://img.shields.io/badge/License%20-Apache%202-337ab7.svg)](https://www.apache.org/licenses/LICENSE-2.0)
44
[![Arsenal](https://img.shields.io/badge/Arsenal%20-%20SmartRefresh-4cae4c.svg)](https://android-arsenal.com/details/1/6001)
5-
[![Maven](https://img.shields.io/badge/%20Maven%20-2.1.1-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
5+
[![Maven](https://img.shields.io/badge/%20Maven%20-3.0.0-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
66
[![MinSdk](https://img.shields.io/badge/%20MinSdk%20-%2012%2B%20-f0ad4e.svg)](https://android-arsenal.com/api?level=12)
77
[![Methods](https://img.shields.io/badge/Methods%20%7C%20Size%20-%20784%20%7C%20121%20KB-d9534f.svg)](http://www.methodscount.com/?lib=io.github.scwang90:refresh%3ASmartRefreshLayout%3A1.0.4)
88

@@ -124,26 +124,17 @@ V2.x 版本已经把依赖库拆分成8个包啦,用到的时候自行引用
124124
```gradle
125125
implementation 'androidx.appcompat:appcompat:1.0.0' //必须 1.0.0 以上
126126
127-
implementation 'io.github.scwang90:refresh-layout-kernel:2.1.1' //核心必须依赖
128-
implementation 'io.github.scwang90:refresh-header-classics:2.1.1' //经典刷新头
129-
implementation 'io.github.scwang90:refresh-header-radar:2.1.1' //雷达刷新头
130-
implementation 'io.github.scwang90:refresh-header-falsify:2.1.1' //虚拟刷新头
131-
implementation 'io.github.scwang90:refresh-header-material:2.1.1' //谷歌刷新头
132-
implementation 'io.github.scwang90:refresh-header-two-level:2.1.1' //二级刷新头
133-
implementation 'io.github.scwang90:refresh-footer-ball:2.1.1' //球脉冲加载
134-
implementation 'io.github.scwang90:refresh-footer-classics:2.1.1' //经典加载
127+
implementation 'io.github.scwang90:refresh-layout-kernel:3.0.0-alpha' //核心必须依赖
128+
implementation 'io.github.scwang90:refresh-header-classics:3.0.0-alpha' //经典刷新头
129+
implementation 'io.github.scwang90:refresh-header-radar:3.0.0-alpha' //雷达刷新头
130+
implementation 'io.github.scwang90:refresh-header-falsify:3.0.0-alpha' //虚拟刷新头
131+
implementation 'io.github.scwang90:refresh-header-material:3.0.0-alpha' //谷歌刷新头
132+
implementation 'io.github.scwang90:refresh-header-two-level:3.0.0-alpha' //二级刷新头
133+
implementation 'io.github.scwang90:refresh-footer-ball:3.0.0-alpha' //球脉冲加载
134+
implementation 'io.github.scwang90:refresh-footer-classics:3.0.0-alpha' //经典加载
135135
136136
137137
```
138-
139-
如果使用 AndroidX 先在 gradle.properties 中添加,两行都不能少噢~
140-
141-
```
142-
android.useAndroidX=true
143-
android.enableJetifier=true
144-
145-
```
146-
147138
#### 2.在XML布局文件中添加 SmartRefreshLayout
148139
```xml
149140
<?xml version="1.0" encoding="utf-8"?>

README_EN.md

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![License](https://img.shields.io/badge/License%20-Apache%202-337ab7.svg)](https://www.apache.org/licenses/LICENSE-2.0)
44
[![Arsenal](https://img.shields.io/badge/Arsenal%20-%20SmartRefresh-4cae4c.svg)](https://android-arsenal.com/details/1/6001)
5-
[![Maven](https://img.shields.io/badge/%20Maven%20-2.1.1-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
5+
[![Maven](https://img.shields.io/badge/%20Maven%20-3.0.0-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
66
[![MinSdk](https://img.shields.io/badge/%20MinSdk%20-%2012%2B%20-f0ad4e.svg)](https://android-arsenal.com/api?level=12)
77
[![Methods](https://img.shields.io/badge/Methods%20%7C%20Size%20-%20784%20%7C%20121%20KB-d9534f.svg)](http://www.methodscount.com/?lib=io.github.scwang90:refresh%3ASmartRefreshLayout%3A1.0.4)
88

@@ -120,21 +120,16 @@ It is recommended that you copy the source code into the project whenever you ne
120120
// Note: There will be no default Header and Footer after subcontracting. It needs to be added manually!
121121
122122
// To search lastest version by https://search.maven.org/search?q=g:io.github.scwang90
123-
implementation 'io.github.scwang90:refresh-layout-kernel:2.1.1' //core
124-
implementation 'io.github.scwang90:refresh-header-classics:2.1.1' //ClassicsHeader
125-
implementation 'io.github.scwang90:refresh-header-radar:2.1.1' //BezierRadarHeader
126-
implementation 'io.github.scwang90:refresh-header-falsify:2.1.1' //FalsifyHeader
127-
implementation 'io.github.scwang90:refresh-header-material:2.1.1' //MaterialHeader
128-
implementation 'io.github.scwang90:refresh-header-two-level:2.1.1' //TwoLevelHeader
129-
implementation 'io.github.scwang90:refresh-footer-ball:2.1.1' //BallPulseFooter
130-
implementation 'io.github.scwang90:refresh-footer-classics:2.1.1' //ClassicsFooter
131-
123+
implementation 'io.github.scwang90:refresh-layout-kernel:3.0.0-alpha' //core
124+
implementation 'io.github.scwang90:refresh-header-classics:3.0.0-alpha' //ClassicsHeader
125+
implementation 'io.github.scwang90:refresh-header-radar:3.0.0-alpha' //BezierRadarHeader
126+
implementation 'io.github.scwang90:refresh-header-falsify:3.0.0-alpha' //FalsifyHeader
127+
implementation 'io.github.scwang90:refresh-header-material:3.0.0-alpha' //MaterialHeader
128+
implementation 'io.github.scwang90:refresh-header-two-level:3.0.0-alpha' //TwoLevelHeader
129+
implementation 'io.github.scwang90:refresh-footer-ball:3.0.0-alpha' //BallPulseFooter
130+
implementation 'io.github.scwang90:refresh-footer-classics:3.0.0-alpha' //ClassicsFooter
132131
133132
```
134-
<!-- // The package name of `io.github.scwang90:refresh` is retained, but not subcontracted. -->
135-
<!-- implementation 'io.github.scwang90:refresh:SmartRefreshHeader:2.0.5' //Headers -->
136-
<!-- implementation 'io.github.scwang90:refresh:SmartRefreshFooter:2.0.5' //Footers -->
137-
<!-- implementation 'io.github.scwang90:refresh:SmartRefreshLayout:2.0.5' //core、 default Header and Footer -->
138133

139134
If you use AndroidX, add it to gradle.properties
140135

app/build.gradle

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -58,34 +58,34 @@ dependencies {
5858

5959
// implementation 'androidx.appcompat:appcompat:1.6.1'
6060
implementation 'androidx.cardview:cardview:1.0.0'
61-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
61+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
6262
// implementation 'androidx.legacy:legacy-support-v4:1.0.0'
63-
implementation 'com.google.android.material:material:1.10.0'
63+
implementation 'com.google.android.material:material:1.12.0'
6464

6565
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
6666

6767
implementation project(':refresh-footer')
6868
implementation project(':refresh-header')
6969
implementation project(':refresh-layout')
7070

71-
implementation project(':refresh-drawable-path')
72-
implementation project(':refresh-layout-kernel')
73-
implementation project(':refresh-header-classics')
74-
implementation project(':refresh-header-radar')
75-
implementation project(':refresh-header-falsify')
76-
implementation project(':refresh-header-material')
77-
implementation project(':refresh-header-two-level')
78-
implementation project(':refresh-footer-ball')
79-
80-
// implementation 'io.github.scwang90:refresh-drawable-path:2.1.0' //矢量路径
81-
// implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0' //核心必须依赖
82-
// implementation 'io.github.scwang90:refresh-header-classics:2.1.0' //经典刷新头
83-
// implementation 'io.github.scwang90:refresh-header-radar:2.1.0' //雷达刷新头
84-
// implementation 'io.github.scwang90:refresh-header-falsify:2.1.0' //虚拟刷新头
85-
// implementation 'io.github.scwang90:refresh-header-material:2.1.0' //谷歌刷新头
86-
// implementation 'io.github.scwang90:refresh-header-two-level:2.1.0' //二级刷新头
87-
// implementation 'io.github.scwang90:refresh-footer-ball:2.1.0' //球脉冲加载
88-
// implementation 'io.github.scwang90:refresh-footer-classics:2.1.0' //经典加载
71+
// implementation project(':refresh-drawable-path')
72+
// implementation project(':refresh-layout-kernel')
73+
// implementation project(':refresh-header-classics')
74+
// implementation project(':refresh-header-radar')
75+
// implementation project(':refresh-header-falsify')
76+
// implementation project(':refresh-header-material')
77+
// implementation project(':refresh-header-two-level')
78+
// implementation project(':refresh-footer-ball')
79+
80+
implementation 'io.github.scwang90:refresh-drawable-path:3.0.0-alpha' //矢量路径
81+
implementation 'io.github.scwang90:refresh-layout-kernel:3.0.0-alpha' //核心必须依赖
82+
implementation 'io.github.scwang90:refresh-header-classics:3.0.0-alpha' //经典刷新头
83+
implementation 'io.github.scwang90:refresh-header-radar:3.0.0-alpha' //雷达刷新头
84+
implementation 'io.github.scwang90:refresh-header-falsify:3.0.0-alpha' //虚拟刷新头
85+
implementation 'io.github.scwang90:refresh-header-material:3.0.0-alpha' //谷歌刷新头
86+
implementation 'io.github.scwang90:refresh-header-two-level:3.0.0-alpha' //二级刷新头
87+
implementation 'io.github.scwang90:refresh-footer-ball:3.0.0-alpha' //球脉冲加载
88+
implementation 'io.github.scwang90:refresh-footer-classics:3.0.0-alpha' //经典加载
8989

9090
implementation 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
9191
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.50'
@@ -103,6 +103,6 @@ dependencies {
103103
annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0'
104104

105105
testImplementation 'junit:junit:4.13.2'
106-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
107-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
106+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
107+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
108108
}

bintrayUpload.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

build.gradle

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ buildscript {
55
google()
66
mavenCentral()
77
gradlePluginPortal()
8-
// jcenter()
9-
// maven { url 'https://maven.aliyun.com/repository/jcenter' }
108
}
119
dependencies {
1210
classpath 'com.android.tools.build:gradle:7.2.2'
@@ -40,7 +38,7 @@ task clean(type: Delete) {
4038
delete rootProject.buildDir
4139
}
4240

43-
def file = 'local.properties'
41+
def file = "${rootProject.projectDir}\\local.properties"
4442
if (new File(file).exists()) {
4543
Properties properties = new Properties()
4644
properties.load(new FileInputStream(file))
@@ -140,8 +138,14 @@ if (new File(file).exists()) {
140138
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
141139
credentials {
142140
// 这里就是之前在 issues.sonatype.org 注册的账号
143-
username "${properties["sonatype.username"]}"
144-
password new String(Base64.mimeDecoder.decode("${properties["sonatype.password"]}"), "UTF-8")
141+
// username "${properties["sonatype.username"]}"
142+
// password new String(Base64.mimeDecoder.decode("${properties["sonatype.password"]}"), "UTF-8")
143+
// 后期改用 Token 认证
144+
def tokenUsername = "${System.getenv('ossrhUsername')}"
145+
def tokenPassword = "${System.getenv('ossrhPassword')}"
146+
println "tokenUsername=\u001B[32m$tokenUsername\u001B[0m;tokenPassword=\u001B[32m$tokenPassword\u001B[0m"
147+
username tokenUsername
148+
password tokenPassword
145149
}
146150
}
147151
}

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android.enableJetifier=true
2121

2222
SMART_USER=scwang90
2323
SMART_GROUP=com.scwang.smart
24-
SMART_VERSION=2.1.1
25-
# -SNAPSHOT
24+
SMART_VERSION=3.0.0-alpha
25+
2626
SMART_PUBLISH=false
2727
SMART_GROUP_MVN=io.github.scwang90
2828
SMART_EMAIL=[email protected]

refresh-drawable-paint/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ android {
2828
dependencies {
2929
implementation fileTree(dir: 'libs', include: ['*.jar'])
3030

31-
compileOnly 'androidx.annotation:annotation:1.7.0'
31+
compileOnly 'androidx.annotation:annotation:1.9.1'
3232

3333
testImplementation 'junit:junit:4.13.2'
34-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
35-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
34+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
35+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
3636
}

refresh-drawable-path/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ dependencies {
3030

3131
api project(':refresh-drawable-paint')
3232

33-
compileOnly 'androidx.appcompat:appcompat:1.6.1'
33+
compileOnly 'androidx.appcompat:appcompat:1.7.0'
3434

3535
testImplementation 'junit:junit:4.13.2'
36-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
37-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
36+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
37+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
3838
}

refresh-footer-ball/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,20 @@ android {
2222
}
2323
}
2424

25+
lintOptions {
26+
abortOnError false
27+
}
28+
2529
}
2630

2731
dependencies {
2832
implementation fileTree(dir: 'libs', include: ['*.jar'])
2933

3034
compileOnly project(':refresh-layout-kernel')
3135

32-
compileOnly 'androidx.appcompat:appcompat:1.6.1'
36+
compileOnly 'androidx.appcompat:appcompat:1.7.0'
3337

3438
testImplementation 'junit:junit:4.13.2'
35-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
36-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
39+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
40+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
3741
}

refresh-footer-classics/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ android {
2222
}
2323
}
2424

25+
lintOptions {
26+
abortOnError false
27+
}
28+
2529
}
2630

2731
dependencies {
@@ -30,9 +34,9 @@ dependencies {
3034
api project(':refresh-drawable-paint')
3135
compileOnly project(':refresh-layout-kernel')
3236

33-
compileOnly 'androidx.appcompat:appcompat:1.6.1'
37+
compileOnly 'androidx.appcompat:appcompat:1.7.0'
3438

3539
testImplementation 'junit:junit:4.13.2'
36-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
37-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
40+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
41+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
3842
}

0 commit comments

Comments
 (0)