diff --git a/Android/doraemonkit-leakcanary/upload.sh b/Android/doraemonkit-leakcanary/upload.sh deleted file mode 100755 index d220f431870d38780e477940e6835cfe2826ec2c..0000000000000000000000000000000000000000 --- a/Android/doraemonkit-leakcanary/upload.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -echo -n "please enter bintray userid ->" -read userid_bintray -echo -n "please enter bintray apikey ->" -read apikey_bintray -../gradlew clean build bintrayUpload -PbintrayUser=${userid_bintray} -PbintrayKey=${apikey_bintray} -PdryRun=false \ No newline at end of file diff --git a/Android/doraemonkit-no-op/upload.sh b/Android/doraemonkit-no-op/upload.sh deleted file mode 100755 index d220f431870d38780e477940e6835cfe2826ec2c..0000000000000000000000000000000000000000 --- a/Android/doraemonkit-no-op/upload.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -echo -n "please enter bintray userid ->" -read userid_bintray -echo -n "please enter bintray apikey ->" -read apikey_bintray -../gradlew clean build bintrayUpload -PbintrayUser=${userid_bintray} -PbintrayKey=${apikey_bintray} -PdryRun=false \ No newline at end of file diff --git a/Android/java/buildSrc_bak/.gitignore b/Android/java/buildSrc/.gitignore similarity index 100% rename from Android/java/buildSrc_bak/.gitignore rename to Android/java/buildSrc/.gitignore diff --git a/Android/java/buildSrc_bak/build.gradle b/Android/java/buildSrc/build.gradle similarity index 100% rename from Android/java/buildSrc_bak/build.gradle rename to Android/java/buildSrc/build.gradle diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExt.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExt.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExt.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExt.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitExtUtil.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitPlugin.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformInvocation.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformInvocation.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformInvocation.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformInvocation.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformTaskExecutionListener.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformTaskExecutionListener.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformTaskExecutionListener.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/DoKitTransformTaskExecutionListener.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/BaseDoKitAsmTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/BaseDoKitAsmTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/BaseDoKitAsmTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/BaseDoKitAsmTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/DoKitAsmTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/DoKitAsmTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/DoKitAsmTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/asmtransformer/DoKitAsmTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/BigImgTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/BigImgTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/BigImgTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/BigImgTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/CommTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/EnterMethodStackTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/EnterMethodStackTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/EnterMethodStackTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/EnterMethodStackTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/GlobalSlowMethodTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/GlobalSlowMethodTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/GlobalSlowMethodTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/GlobalSlowMethodTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/MethodStackDepTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/MethodStackDepTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/MethodStackDepTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/MethodStackDepTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/UrlConnectionTransformer.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/UrlConnectionTransformer.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/UrlConnectionTransformer.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/classtransformer/UrlConnectionTransformer.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/CommExt.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/CommExt.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/CommExt.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/CommExt.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExt.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExt.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExt.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/DoKitExt.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/SlowMethodExt.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/SlowMethodExt.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/SlowMethodExt.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/extension/SlowMethodExt.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/processor/DoKitPluginConfigProcessor.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNode.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNode.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNode.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNode.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNodeUtil.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNodeUtil.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNodeUtil.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/stack_method/MethodStackNodeUtil.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitBaseTransform.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitBaseTransform.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitBaseTransform.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitBaseTransform.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitCommTransform.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitCommTransform.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitCommTransform.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitCommTransform.kt diff --git a/Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitDependTransform.kt b/Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitDependTransform.kt similarity index 100% rename from Android/java/buildSrc_bak/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitDependTransform.kt rename to Android/java/buildSrc/src/main/kotlin/com/didichuxing/doraemonkit/plugin/transform/DoKitDependTransform.kt diff --git a/Android/java/buildSrc_bak/src/main/resources/META-INF/gradle-plugins/com.didi.dokit.debug.properties b/Android/java/buildSrc/src/main/resources/META-INF/gradle-plugins/com.didi.dokit.debug.properties similarity index 100% rename from Android/java/buildSrc_bak/src/main/resources/META-INF/gradle-plugins/com.didi.dokit.debug.properties rename to Android/java/buildSrc/src/main/resources/META-INF/gradle-plugins/com.didi.dokit.debug.properties diff --git a/Doc/android_cn_guide.md b/Doc/android_cn_guide.md index c87203991dd982fb57179662effade1d57947ff8..e0ee10cdaac73b52300f4c1643da6e3499b96525 100644 --- a/Doc/android_cn_guide.md +++ b/Doc/android_cn_guide.md @@ -3,7 +3,7 @@ |DoKit|最新版本|描述| |-|-|-| |支持Androidx|3.1.6|从v3.1.0版本开始支持androidx| -|支持android support|3.0.6|3.0.6版本对应3.1.5的功能，后期support将会不定期更新，主要还是看社区的反馈，请大家尽快升级和适配Androidx| +|支持android support|3.0.7.1|3.0.7.1版本对应3.1.6的功能，后期support将会不定期更新，主要还是看社区的反馈，请大家尽快升级和适配Androidx| #### 1. Gradle 依赖 diff --git a/Doc/android_en_guide.md b/Doc/android_en_guide.md index ef9e2b6393211944868a157f3901628e2ce7b1e3..5cdba7424be0a0d0798324a7fcf0b0d837bfae0a 100644 --- a/Doc/android_en_guide.md +++ b/Doc/android_en_guide.md @@ -3,7 +3,7 @@ |DoKit|new Version|Desc| |- |- |- | |support Androidx|3.1.6|support Androidx from v3.1.0| -|supprot android support|3.0.6|Version 3.0.6 corresponds to the function of 3.1.5. Later support will be updated from time to time, mainly based on community feedback, please upgrade and adapt to Androidx as soon as possible| +|supprot android support|3.0.7.1|Version 3.0.7.1 corresponds to the function of 3.1.6. Later support will be updated from time to time, mainly based on community feedback, please upgrade and adapt to Androidx as soon as possible| #### 1. DoKit SDK Dependencie