Update skin support to 4.0.0

ximsfei · Sep 27, 2018 · 7408fd1 · 7408fd1
1 parent c4dd8b1
commit 7408fd1
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 中文 | [In English](docs/README.md) 
 
-[![skin-support](https://img.shields.io/badge/release-v3.1.0--beta1-green.svg)](http://jcenter.bintray.com/skin/support)
+[![skin-support](https://img.shields.io/badge/release-v4.0.0-green.svg)](http://jcenter.bintray.com/skin/support)
 ![build](https://img.shields.io/badge/build-passing-green.svg)
 ![license](https://img.shields.io/badge/license-mit-blue.svg)
 
@@ -67,12 +67,12 @@ SkinCompatManager.withoutActivity(this).loadSkin();
 * [x] 资源加载优先级: 动态设置资源-加载策略中的资源-插件式换肤/应用内换肤-应用资源。
 * [x] 支持定制化，选择需要的模块加载。
 * [x] 支持矢量图(vector/svg)换肤。
+* [x] skin-support 4.0.0以上支持AndroidX，4.0.0以下支持support库
 
 *[详细内容, 请查看更新日志](docs/ChangeLog.md)，那里有所有功能提交记录*
 
 ### TODO
 
-* [x] 解耦skin-support对appcompat-v7的依赖。
 * [ ] `AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);`开关使用错误问题修正。
 * [ ] 支持多语言。
 * [ ] 支持多字体。
@@ -94,7 +94,9 @@ SkinCompatManager.withoutActivity(this).loadSkin();
 
 > [android-support](android-support)                                  // Android 原生控件
 
->> [skin-support](android-support／skin-support)                      // 换肤框架, 基础控件支持
+>> [skin-support](android-support／skin-support)                      // 换肤框架
+
+>> [skin-support-appcompat](android-support／skin-support-appcompat)  // 换肤框架, 基础控件支持
 
 >> [skin-support-cardview](android-support／skin-support-cardview)    // 换肤框架, CardView 支持
 
@@ -113,14 +115,25 @@ SkinCompatManager.withoutActivity(this).loadSkin();
 ## 用法
 
 ### 导入:
-直接添加依赖, [最新版本选择, 请查看更新日志](docs/ChangeLog.md)
+如果项目中使用了[AndroidX](https://developer.android.google.cn/topic/libraries/support-library/androidx-overview), 添加以下依赖
+```xml
+implementation 'skin.support:skin-support:4.0.0'                   // skin-support
+implementation 'skin.support:skin-support-appcompat:4.0.0'         // skin-support 基础控件支持
+implementation 'skin.support:skin-support-design:4.0.0'            // skin-support-design material design 控件支持[可选]
+implementation 'skin.support:skin-support-cardview:4.0.0'          // skin-support-cardview CardView 控件支持[可选]
+implementation 'skin.support:skin-support-constraint-layout:4.0.0' // skin-support-constraint-layout ConstraintLayout 控件支持[可选]
+```
+
+如果项目中还在使用support库，添加以下依赖
 ```xml
 implementation 'skin.support:skin-support:3.1.0-beta1'                   // skin-support 基础控件支持
 implementation 'skin.support:skin-support-design:3.1.0-beta1'            // skin-support-design material design 控件支持[可选]
 implementation 'skin.support:skin-support-cardview:3.1.0-beta1'          // skin-support-cardview CardView 控件支持[可选]
 implementation 'skin.support:skin-support-constraint-layout:3.1.0-beta1' // skin-support-constraint-layout ConstraintLayout 控件支持[可选]
 ```
 
+[最新版本选择, 请查看更新日志](docs/ChangeLog.md)
+
 ### 使用:
 
 #### 在Application的onCreate中初始化

diff --git a/build.gradle b/build.gradle
@@ -41,5 +41,5 @@ ext {
 
     glideVersion = "4.7.1"
 
-    skinSupportVersion = "3.1.0-beta1"
+    skinSupportVersion = "4.0.0"
 }
diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
@@ -2,6 +2,10 @@
 
 ## skin-support
 
+* ![v4.0.0](https://img.shields.io/badge/skin--support-v4.0.0-green.svg)
+  * Add AndroidX support
+  * Add Android P support
+
 * ![v3.1.0-beta1](https://img.shields.io/badge/skin--support-v3.1.0--beta1-green.svg)
   * bugfix:
     * issue #151

diff --git a/docs/README.md b/docs/README.md
@@ -2,7 +2,7 @@
 
 [中文](../README.md) | In English 
 
-[![skin-support](https://img.shields.io/badge/release-v3.1.0--beta1-green.svg)](http://jcenter.bintray.com/skin/support)
+[![skin-support](https://img.shields.io/badge/release-v4.0.0-green.svg)](http://jcenter.bintray.com/skin/support)
 ![build](https://img.shields.io/badge/build-passing-green.svg)
 ![license](https://img.shields.io/badge/license-mit-blue.svg)
 
@@ -37,7 +37,19 @@ Now, you have a strong skinning feature. What you need to do is [make a skin](#m
 
 The Gradle Dependency is available via [jCenter](https://bintray.com/pengfeng/skin-support),
 
-Add dependencies directly, [For the latest version, please refer to change log](ChangeLog.md)
+[For the latest version, please refer to change log](ChangeLog.md)
+
+Add dependencies for [AndroidX](https://developer.android.com/topic/libraries/support-library/androidx-overview)
+
+```xml
+implementation 'skin.support:skin-support:4.0.0'                   // skin-support
+implementation 'skin.support:skin-support-appcompat:4.0.0'         // skin-support basic widget
+implementation 'skin.support:skin-support-design:4.0.0'            // skin-support-design material design support [selectable]
+implementation 'skin.support:skin-support-cardview:4.0.0'          // skin-support-cardview CardView support [selectable]
+implementation 'skin.support:skin-support-constraint-layout:4.0.0' // skin-support-constraint-layout ConstraintLayout support [selectable]
+```
+
+Add dependencies for support libraries
 
 ```xml
 implementation 'skin.support:skin-support:3.1.0-beta1'                   // skin-support basic widget

diff --git a/uploadSkinSupport.sh b/uploadSkinSupport.sh
@@ -1,2 +1,7 @@
 #!/usr/bin/env bash
-./gradlew android-support:skin-support:bintrayUpload --stacktrace android-support:skin-support-design:bintrayUpload --stacktrace android-support:skin-support-cardview:bintrayUpload --stacktrace android-support:skin-support-constraint-layout:bintrayUpload --stacktrace
+./gradlew \
+android-support:skin-support:bintrayUpload --stacktrace \
+android-support:skin-support-appcompat:bintrayUpload --stacktrace \
+android-support:skin-support-design:bintrayUpload --stacktrace \
+android-support:skin-support-cardview:bintrayUpload --stacktrace \
+android-support:skin-support-constraint-layout:bintrayUpload --stacktrace