上传发布 V2.1.1 版本，

scwang90 · Oct 10, 2024 · 06aebc7 · 06aebc7
1 parent e4d83a2
commit 06aebc7
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 44 deletions.
diff --git a/README_EN.md b/README_EN.md
@@ -128,10 +128,6 @@ implementation  'com.scwang.smart:refresh-footer-ball:2.1.1'        //BallPulseF
 implementation  'com.scwang.smart:refresh-footer-classics:2.1.1'    //ClassicsFooter
 
 ```
-<!-- // The package name of `com.scwang.smartrefresh` is retained, but not subcontracted. -->
-<!-- implementation 'com.scwang.smartrefresh:SmartRefreshHeader:2.1.1'   //Headers -->
-<!-- implementation 'com.scwang.smartrefresh:SmartRefreshFooter:2.1.1'   //Footers -->
-<!-- implementation 'com.scwang.smartrefresh:SmartRefreshLayout:2.1.1'   //core、 default Header and Footer -->
 
 If you use AndroidX, add it to gradle.properties
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -66,24 +66,24 @@ dependencies {
     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:2.1.1'      //矢量路径
+    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 'com.android.support:design:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'

diff --git a/app/src/main/java/com/scwang/refreshlayout/activity/example/I18nExampleActivity.java b/app/src/main/java/com/scwang/refreshlayout/activity/example/I18nExampleActivity.java
@@ -93,11 +93,7 @@ private void changeAppLanguage(Locale locale) {
         Resources res = getResources();
         DisplayMetrics dm = res.getDisplayMetrics();
         Configuration conf = res.getConfiguration();
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1) {
-            conf.locale = locale;
-        } else {
-            conf.setLocale(locale);
-        }
+        conf.setLocale(locale);
         res.updateConfiguration(conf, dm);
         startActivity(new Intent(this, getClass()));
         overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out);

diff --git a/build.gradle b/build.gradle
@@ -41,7 +41,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))
@@ -141,8 +141,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
@@ -15,12 +15,12 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-#android.useAndroidX=true
-#android.enableJetifier=true
+# org.gradle.java.home=D\:\\Program Files\\Java\\openjdk-17
 
 SMART_USER=scwang90
 SMART_GROUP=com.scwang.smart
 SMART_VERSION=2.1.1
+
 SMART_PUBLISH=false
 SMART_GROUP_MVN=io.github.scwang90
 SMART_EMAIL=[email protected]

diff --git a/gradlew-publish b/gradlew-publish
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+./gradlew build publish
+
+#./gradlew :refresh-layout-kernel:publish
+
+#./gradlew :refresh-drawable-paint:publish
+#./gradlew :refresh-drawable-path:publish
+
+#./gradlew :refresh-footer-ball:publish
+#./gradlew :refresh-footer-classics:publish
+
+#./gradlew :refresh-header-classics:publish
+#./gradlew :refresh-header-falsify:publish
+#./gradlew :refresh-header-material:publish
+#./gradlew :refresh-header-radar:publish
+#./gradlew :refresh-header-two-level:publish
diff --git a/refresh-footer/build.gradle b/refresh-footer/build.gradle
@@ -31,7 +31,10 @@ dependencies {
     })
     testImplementation 'junit:junit:4.12'
 
-    compileOnly project(':refresh-footer-ball')
-    compileOnly project(':refresh-footer-classics')
     compileOnly project(':refresh-layout')
+//    compileOnly project(':refresh-footer-ball')
+//    compileOnly project(':refresh-footer-classics')
+
+    compileOnly  'io.github.scwang90:refresh-footer-ball:2.1.1'        //球脉冲加载
+    compileOnly  'io.github.scwang90:refresh-footer-classics:2.1.1'    //经典加载
 }
diff --git a/refresh-header/build.gradle b/refresh-header/build.gradle
@@ -30,12 +30,18 @@ dependencies {
     })
     testImplementation 'junit:junit:4.12'
 
-    compileOnly 'com.android.support:support-annotations:28.0.0'
     compileOnly 'com.android.support:support-v4:28.0.0'
+    compileOnly 'com.android.support:support-annotations:28.0.0'
+
     compileOnly project(':refresh-layout')
-    compileOnly project(':refresh-drawable-path')
-    compileOnly project(':refresh-header-material')
+
+//    compileOnly project(':refresh-drawable-path')
+//    compileOnly project(':refresh-header-material')
+//    compileOnly project(':refresh-layout-kernel')
+//    compileOnly project(':refresh-header-falsify')
 
-    compileOnly project(':refresh-layout-kernel')
-    compileOnly project(':refresh-header-falsify')
+    compileOnly  'io.github.scwang90:refresh-drawable-path:2.1.1'      //矢量路径
+    compileOnly  'io.github.scwang90:refresh-layout-kernel:2.1.1'      //核心必须依赖
+    compileOnly  'io.github.scwang90:refresh-header-falsify:2.1.1'     //虚拟刷新头
+    compileOnly  'io.github.scwang90:refresh-header-material:2.1.1'    //谷歌刷新头
 }
diff --git a/refresh-layout/build.gradle b/refresh-layout/build.gradle
@@ -31,10 +31,16 @@ dependencies {
     testImplementation 'junit:junit:4.12'
 
     compileOnly 'com.android.support:design:28.0.0'
-    compileOnly project(':refresh-layout-kernel')
-    compileOnly project(':refresh-footer-ball')
-    compileOnly project(':refresh-header-falsify')
-    compileOnly project(':refresh-header-radar')
-    compileOnly project(':refresh-header-two-level')
+
+//    compileOnly project(':refresh-layout-kernel')
+//    compileOnly project(':refresh-footer-ball')
+//    compileOnly project(':refresh-header-falsify')
+//    compileOnly project(':refresh-header-radar')
+//    compileOnly project(':refresh-header-two-level')
 
+    compileOnly  'io.github.scwang90:refresh-layout-kernel:2.1.1'      //核心必须依赖
+    compileOnly  'io.github.scwang90:refresh-header-radar:2.1.1'       //雷达刷新头
+    compileOnly  'io.github.scwang90:refresh-header-falsify:2.1.1'     //虚拟刷新头
+    compileOnly  'io.github.scwang90:refresh-header-two-level:2.1.1'   //二级刷新头
+    compileOnly  'io.github.scwang90:refresh-footer-ball:2.1.1'        //球脉冲加载
 }