上传发布 V3.0.0-alpha 版本，

scwang90 · Oct 15, 2024 · 61cc34a · 61cc34a
1 parent 8ce6e3e
commit 61cc34a
Show file tree

Hide file tree

Showing 19 changed files with 135 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![License](https://img.shields.io/badge/License%20-Apache%202-337ab7.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Arsenal](https://img.shields.io/badge/Arsenal%20-%20SmartRefresh-4cae4c.svg)](https://android-arsenal.com/details/1/6001)
-[![Maven](https://img.shields.io/badge/%20Maven%20-2.1.1-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
+[![Maven](https://img.shields.io/badge/%20Maven%20-3.0.0-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
 [![MinSdk](https://img.shields.io/badge/%20MinSdk%20-%2012%2B%20-f0ad4e.svg)](https://android-arsenal.com/api?level=12)
 [![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)
 
@@ -124,26 +124,17 @@ V2.x 版本已经把依赖库拆分成8个包啦，用到的时候自行引用
 ```gradle
 implementation 'androidx.appcompat:appcompat:1.0.0'                 //必须 1.0.0 以上
 
-implementation  'io.github.scwang90:refresh-layout-kernel:2.1.1'      //核心必须依赖
-implementation  'io.github.scwang90:refresh-header-classics:2.1.1'    //经典刷新头
-implementation  'io.github.scwang90:refresh-header-radar:2.1.1'       //雷达刷新头
-implementation  'io.github.scwang90:refresh-header-falsify:2.1.1'     //虚拟刷新头
-implementation  'io.github.scwang90:refresh-header-material:2.1.1'    //谷歌刷新头
-implementation  'io.github.scwang90:refresh-header-two-level:2.1.1'   //二级刷新头
-implementation  'io.github.scwang90:refresh-footer-ball:2.1.1'        //球脉冲加载
-implementation  'io.github.scwang90:refresh-footer-classics:2.1.1'    //经典加载
+implementation  'io.github.scwang90:refresh-layout-kernel:3.0.0-alpha'      //核心必须依赖
+implementation  'io.github.scwang90:refresh-header-classics:3.0.0-alpha'    //经典刷新头
+implementation  'io.github.scwang90:refresh-header-radar:3.0.0-alpha'       //雷达刷新头
+implementation  'io.github.scwang90:refresh-header-falsify:3.0.0-alpha'     //虚拟刷新头
+implementation  'io.github.scwang90:refresh-header-material:3.0.0-alpha'    //谷歌刷新头
+implementation  'io.github.scwang90:refresh-header-two-level:3.0.0-alpha'   //二级刷新头
+implementation  'io.github.scwang90:refresh-footer-ball:3.0.0-alpha'        //球脉冲加载
+implementation  'io.github.scwang90:refresh-footer-classics:3.0.0-alpha'    //经典加载
 
 
 ```
-
-如果使用 AndroidX 先在 gradle.properties 中添加，两行都不能少噢~
-
-```
-android.useAndroidX=true
-android.enableJetifier=true
-
-```
-
 #### 2.在XML布局文件中添加 SmartRefreshLayout
 ```xml
 <?xml version="1.0" encoding="utf-8"?>

diff --git a/README_EN.md b/README_EN.md
@@ -2,7 +2,7 @@
 
 [![License](https://img.shields.io/badge/License%20-Apache%202-337ab7.svg)](https://www.apache.org/licenses/LICENSE-2.0)
 [![Arsenal](https://img.shields.io/badge/Arsenal%20-%20SmartRefresh-4cae4c.svg)](https://android-arsenal.com/details/1/6001)
-[![Maven](https://img.shields.io/badge/%20Maven%20-2.1.1-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
+[![Maven](https://img.shields.io/badge/%20Maven%20-3.0.0-5bc0de.svg)](https://s01.oss.sonatype.org/#nexus-search;quick~refresh-layout-kernel)
 [![MinSdk](https://img.shields.io/badge/%20MinSdk%20-%2012%2B%20-f0ad4e.svg)](https://android-arsenal.com/api?level=12)
 [![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)
 
@@ -120,21 +120,16 @@ It is recommended that you copy the source code into the project whenever you ne
 // Note: There will be no default Header and Footer after subcontracting. It needs to be added manually!
 
 // To search lastest version by https://search.maven.org/search?q=g:io.github.scwang90    
-implementation 'io.github.scwang90:refresh-layout-kernel:2.1.1'     //core
-implementation 'io.github.scwang90:refresh-header-classics:2.1.1'   //ClassicsHeader
-implementation 'io.github.scwang90:refresh-header-radar:2.1.1'      //BezierRadarHeader
-implementation 'io.github.scwang90:refresh-header-falsify:2.1.1'    //FalsifyHeader
-implementation 'io.github.scwang90:refresh-header-material:2.1.1'   //MaterialHeader
-implementation 'io.github.scwang90:refresh-header-two-level:2.1.1'  //TwoLevelHeader
-implementation 'io.github.scwang90:refresh-footer-ball:2.1.1'       //BallPulseFooter
-implementation 'io.github.scwang90:refresh-footer-classics:2.1.1'   //ClassicsFooter
-
+implementation 'io.github.scwang90:refresh-layout-kernel:3.0.0-alpha'     //core
+implementation 'io.github.scwang90:refresh-header-classics:3.0.0-alpha'   //ClassicsHeader
+implementation 'io.github.scwang90:refresh-header-radar:3.0.0-alpha'      //BezierRadarHeader
+implementation 'io.github.scwang90:refresh-header-falsify:3.0.0-alpha'    //FalsifyHeader
+implementation 'io.github.scwang90:refresh-header-material:3.0.0-alpha'   //MaterialHeader
+implementation 'io.github.scwang90:refresh-header-two-level:3.0.0-alpha'  //TwoLevelHeader
+implementation 'io.github.scwang90:refresh-footer-ball:3.0.0-alpha'       //BallPulseFooter
+implementation 'io.github.scwang90:refresh-footer-classics:3.0.0-alpha'   //ClassicsFooter
 
 ```
-<!-- // The package name of `io.github.scwang90:refresh` is retained, but not subcontracted. -->
-<!-- implementation 'io.github.scwang90:refresh:SmartRefreshHeader:2.0.5'   //Headers -->
-<!-- implementation 'io.github.scwang90:refresh:SmartRefreshFooter:2.0.5'   //Footers -->
-<!-- implementation 'io.github.scwang90:refresh:SmartRefreshLayout:2.0.5'   //core、 default Header and Footer -->
 
 If you use AndroidX, add it to gradle.properties
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -58,34 +58,34 @@ dependencies {
 
 //    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
 //    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.12.0'
 
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
 
     implementation project(':refresh-footer')
     implementation project(':refresh-header')
     implementation project(':refresh-layout')
 
-    implementation project(':refresh-drawable-path')
-    implementation project(':refresh-layout-kernel')
-    implementation project(':refresh-header-classics')
-    implementation project(':refresh-header-radar')
-    implementation project(':refresh-header-falsify')
-    implementation project(':refresh-header-material')
-    implementation project(':refresh-header-two-level')
-    implementation project(':refresh-footer-ball')
-
-//    implementation  'io.github.scwang90:refresh-drawable-path:2.1.0'      //矢量路径
-//    implementation  'io.github.scwang90:refresh-layout-kernel:2.1.0'      //核心必须依赖
-//    implementation  'io.github.scwang90:refresh-header-classics:2.1.0'    //经典刷新头
-//    implementation  'io.github.scwang90:refresh-header-radar:2.1.0'       //雷达刷新头
-//    implementation  'io.github.scwang90:refresh-header-falsify:2.1.0'     //虚拟刷新头
-//    implementation  'io.github.scwang90:refresh-header-material:2.1.0'    //谷歌刷新头
-//    implementation  'io.github.scwang90:refresh-header-two-level:2.1.0'   //二级刷新头
-//    implementation  'io.github.scwang90:refresh-footer-ball:2.1.0'        //球脉冲加载
-//    implementation  'io.github.scwang90:refresh-footer-classics:2.1.0'    //经典加载
+//    implementation project(':refresh-drawable-path')
+//    implementation project(':refresh-layout-kernel')
+//    implementation project(':refresh-header-classics')
+//    implementation project(':refresh-header-radar')
+//    implementation project(':refresh-header-falsify')
+//    implementation project(':refresh-header-material')
+//    implementation project(':refresh-header-two-level')
+//    implementation project(':refresh-footer-ball')
+
+    implementation  'io.github.scwang90:refresh-drawable-path:3.0.0-alpha'      //矢量路径
+    implementation  'io.github.scwang90:refresh-layout-kernel:3.0.0-alpha'      //核心必须依赖
+    implementation  'io.github.scwang90:refresh-header-classics:3.0.0-alpha'    //经典刷新头
+    implementation  'io.github.scwang90:refresh-header-radar:3.0.0-alpha'       //雷达刷新头
+    implementation  'io.github.scwang90:refresh-header-falsify:3.0.0-alpha'     //虚拟刷新头
+    implementation  'io.github.scwang90:refresh-header-material:3.0.0-alpha'    //谷歌刷新头
+    implementation  'io.github.scwang90:refresh-header-two-level:3.0.0-alpha'   //二级刷新头
+    implementation  'io.github.scwang90:refresh-footer-ball:3.0.0-alpha'        //球脉冲加载
+    implementation  'io.github.scwang90:refresh-footer-classics:3.0.0-alpha'    //经典加载
 
     implementation 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
     implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.50'
@@ -103,6 +103,6 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/bintrayUpload.bat b/bintrayUpload.bat
diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,6 @@ buildscript {
         google()
         mavenCentral()
         gradlePluginPortal()
-//        jcenter()
-//        maven { url 'https://maven.aliyun.com/repository/jcenter' }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.2'
@@ -40,7 +38,7 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-def file = 'local.properties'
+def file = "${rootProject.projectDir}\\local.properties"
 if (new File(file).exists()) {
     Properties properties = new Properties()
     properties.load(new FileInputStream(file))
@@ -140,8 +138,14 @@ if (new File(file).exists()) {
                                     url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
                                     credentials {
                                         // 这里就是之前在 issues.sonatype.org 注册的账号
-                                        username "${properties["sonatype.username"]}"
-                                        password new String(Base64.mimeDecoder.decode("${properties["sonatype.password"]}"), "UTF-8")
+                                        // username "${properties["sonatype.username"]}"
+                                        // password new String(Base64.mimeDecoder.decode("${properties["sonatype.password"]}"), "UTF-8")
+                                        // 后期改用 Token 认证
+                                        def tokenUsername = "${System.getenv('ossrhUsername')}"
+                                        def tokenPassword = "${System.getenv('ossrhPassword')}"
+                                        println "tokenUsername=\u001B[32m$tokenUsername\u001B[0m;tokenPassword=\u001B[32m$tokenPassword\u001B[0m"
+                                        username tokenUsername
+                                        password tokenPassword
                                     }
                                 }
                             }

diff --git a/gradle.properties b/gradle.properties
@@ -21,8 +21,8 @@ android.enableJetifier=true
 
 SMART_USER=scwang90
 SMART_GROUP=com.scwang.smart
-SMART_VERSION=2.1.1
-# -SNAPSHOT
+SMART_VERSION=3.0.0-alpha
+
 SMART_PUBLISH=false
 SMART_GROUP_MVN=io.github.scwang90
 SMART_EMAIL=[email protected]

diff --git a/refresh-drawable-paint/build.gradle b/refresh-drawable-paint/build.gradle
@@ -28,9 +28,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compileOnly 'androidx.annotation:annotation:1.7.0'
+    compileOnly 'androidx.annotation:annotation:1.9.1'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/refresh-drawable-path/build.gradle b/refresh-drawable-path/build.gradle
@@ -30,9 +30,9 @@ dependencies {
 
     api project(':refresh-drawable-paint')
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/refresh-footer-ball/build.gradle b/refresh-footer-ball/build.gradle
@@ -22,16 +22,20 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     compileOnly project(':refresh-layout-kernel')
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/refresh-footer-classics/build.gradle b/refresh-footer-classics/build.gradle
@@ -22,6 +22,10 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
@@ -30,9 +34,9 @@ dependencies {
     api project(':refresh-drawable-paint')
     compileOnly project(':refresh-layout-kernel')
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/refresh-footer/build.gradle b/refresh-footer/build.gradle
@@ -28,15 +28,15 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     compileOnly project(':refresh-layout')
-    compileOnly project(':refresh-footer-ball')
-    compileOnly project(':refresh-footer-classics')
+//    compileOnly project(':refresh-footer-ball')
+//    compileOnly project(':refresh-footer-classics')
 
-//    implementation  'io.github.scwang90:refresh-footer-ball:2.1.0'        //球脉冲加载
-//    implementation  'io.github.scwang90:refresh-footer-classics:2.1.0'    //经典加载
+    compileOnly  'io.github.scwang90:refresh-footer-ball:3.0.0-alpha'        //球脉冲加载
+    compileOnly  'io.github.scwang90:refresh-footer-classics:3.0.0-alpha'    //经典加载
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/refresh-header-classics/build.gradle b/refresh-header-classics/build.gradle
@@ -22,6 +22,10 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
@@ -30,10 +34,10 @@ dependencies {
     api project(':refresh-footer-classics')
     compileOnly project(':refresh-layout-kernel')
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
 }
diff --git a/refresh-header-falsify/build.gradle b/refresh-header-falsify/build.gradle
@@ -22,16 +22,19 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     compileOnly project(':refresh-layout-kernel')
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/refresh-header-material/build.gradle b/refresh-header-material/build.gradle
@@ -22,16 +22,20 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     compileOnly project(':refresh-layout-kernel')
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
diff --git a/refresh-header-radar/build.gradle b/refresh-header-radar/build.gradle
@@ -22,16 +22,20 @@ android {
         }
     }
 
+    lintOptions {
+        abortOnError false
+    }
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     compileOnly project(':refresh-layout-kernel')
 
-    compileOnly 'androidx.appcompat:appcompat:1.6.1'
+    compileOnly 'androidx.appcompat:appcompat:1.7.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }