From 1f21b165275089114f6b5512609ca5f2736f9b0a Mon Sep 17 00:00:00 2001 From: realonezhang Date: Wed, 25 May 2022 10:19:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?type:=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=89=88=E6=9C=AC=203.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/config.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android/config.gradle b/Android/config.gradle index 4b5de98ff..9c0829687 100755 --- a/Android/config.gradle +++ b/Android/config.gradle @@ -13,7 +13,7 @@ ext { //是否使用本地仓库,需要使用绝对路径,仓库地址在 local.properties 中添加 LOCAL_REPOSITORY_URL use_local : true, group_id : 'io.github.didi.dokit', - version : '3.6.10' + version : '3.7.0' ] android = [compileSdkVersion : 29, From 9f9f3fff3e3dac6fbe7d5ddf1744155c762d7d3a Mon Sep 17 00:00:00 2001 From: realonezhang Date: Wed, 25 May 2022 15:13:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?type:=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=89=88=E6=9C=AC=203.7.1=20=E4=BF=AE=E6=94=B9=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/config.gradle | 5 ++--- Android/upload_didi.sh | 7 ++++--- Android/upload_local.sh | 10 +++++----- Android/upload_maven.sh | 7 +++++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/Android/config.gradle b/Android/config.gradle index 9c0829687..fe6176c29 100755 --- a/Android/config.gradle +++ b/Android/config.gradle @@ -13,7 +13,7 @@ ext { //是否使用本地仓库,需要使用绝对路径,仓库地址在 local.properties 中添加 LOCAL_REPOSITORY_URL use_local : true, group_id : 'io.github.didi.dokit', - version : '3.7.0' + version : '3.7.1' ] android = [compileSdkVersion : 29, @@ -165,8 +165,7 @@ ext { String version = publish_config["version"] //分割字符串 String[] vs = version.split("\\.") -// return vs.length == 3 - return false + return vs.length == 3 } usePrivateEnv = { diff --git a/Android/upload_didi.sh b/Android/upload_didi.sh index 26dee5d65..ef31e3f0e 100755 --- a/Android/upload_didi.sh +++ b/Android/upload_didi.sh @@ -18,12 +18,12 @@ RES="\033[0m" ./gradlew :dokit-okhttp-api:assembleRelease --stacktrace ./gradlew :dokit-okhttp-v3:assembleRelease --stacktrace ./gradlew :dokit-okhttp-v4:assembleRelease --stacktrace -./gradlew :dokit-util:assembleRelease --stacktrace -./gradlew :dokit-weex:assembleRelease --stacktrace ./gradlew :dokit-ft:assembleRelease --stacktrace ./gradlew :dokit-test:assembleRelease --stacktrace ./gradlew :dokit-autotest:assembleRelease --stacktrace ./gradlew :dokit-mc:assembleRelease --stacktrace +./gradlew :dokit-util:assembleRelease --stacktrace +./gradlew :dokit-weex:assembleRelease --stacktrace ./gradlew :dokit-gps-mock:assembleRelease --stacktrace ./gradlew :dokit-pthread-hook:assembleRelease --stacktrace #publish @@ -39,5 +39,6 @@ RES="\033[0m" ./gradlew :dokit-mc:publish ./gradlew :dokit-util:publish ./gradlew :dokit-weex:publish -./gradlew :dokit-gps-mock:publish --stacktrace +./gradlew :dokit-pthread-hook:publish +./gradlew :dokit-gps-mock:publish echo -e "${GREEN_COLOR} 打包上传到滴滴内部仓库完成!!!${RES}" diff --git a/Android/upload_local.sh b/Android/upload_local.sh index 27c3ef69b..951cf8def 100755 --- a/Android/upload_local.sh +++ b/Android/upload_local.sh @@ -18,14 +18,14 @@ RES="\033[0m" ./gradlew :dokit-okhttp-api:assembleRelease --stacktrace ./gradlew :dokit-okhttp-v3:assembleRelease --stacktrace ./gradlew :dokit-okhttp-v4:assembleRelease --stacktrace -./gradlew :dokit-util:assembleRelease --stacktrace -./gradlew :dokit-weex:assembleRelease --stacktrace ./gradlew :dokit-ft:assembleRelease --stacktrace ./gradlew :dokit-test:assembleRelease --stacktrace ./gradlew :dokit-autotest:assembleRelease --stacktrace ./gradlew :dokit-mc:assembleRelease --stacktrace -./gradlew :dokit-gps-mock:assembleRelease --stacktrace +./gradlew :dokit-util:assembleRelease --stacktrace +./gradlew :dokit-weex:assembleRelease --stacktrace ./gradlew :dokit-pthread-hook:assembleRelease --stacktrace +./gradlew :dokit-gps-mock:assembleRelease --stacktrace #publish ./gradlew :dokit:publish --stacktrace ./gradlew :dokit-no-op:publish --stacktrace @@ -33,12 +33,12 @@ RES="\033[0m" ./gradlew :dokit-okhttp-v3:publish --stacktrace ./gradlew :dokit-okhttp-v4:publish --stacktrace ./gradlew :dokit-plugin:publish --stacktrace -./gradlew :dokit-util:publish --stacktrace -./gradlew :dokit-weex:publish --stacktrace ./gradlew :dokit-ft:publish --stacktrace ./gradlew :dokit-test:publish --stacktrace ./gradlew :dokit-autotest:publish --stacktrace ./gradlew :dokit-mc:publish --stacktrace +./gradlew :dokit-util:publish --stacktrace +./gradlew :dokit-weex:publish --stacktrace ./gradlew :dokit-pthread-hook:publish --stacktrace ./gradlew :dokit-gps-mock:publish --stacktrace echo -e "${GREEN_COLOR}本地打包完成!!!${RES}" diff --git a/Android/upload_maven.sh b/Android/upload_maven.sh index 537e01b4c..f2e299548 100755 --- a/Android/upload_maven.sh +++ b/Android/upload_maven.sh @@ -15,7 +15,6 @@ RES="\033[0m" ./gradlew :dokit-plugin:assemble --stacktrace ./gradlew :dokit:assembleRelease --stacktrace ./gradlew :dokit-no-op:assembleRelease --stacktrace -./gradlew :dokit-util:assembleRelease --stacktrace ./gradlew :dokit-okhttp-api:assembleRelease --stacktrace ./gradlew :dokit-okhttp-v3:assembleRelease --stacktrace ./gradlew :dokit-okhttp-v4:assembleRelease --stacktrace @@ -23,13 +22,14 @@ RES="\033[0m" ./gradlew :dokit-test:assembleRelease --stacktrace ./gradlew :dokit-autotest:assembleRelease --stacktrace ./gradlew :dokit-mc:assembleRelease --stacktrace +./gradlew :dokit-util:assembleRelease --stacktrace ./gradlew :dokit-weex:assembleRelease --stacktrace ./gradlew :dokit-pthread-hook:assembleRelease --stacktrace +./gradlew :dokit-gps-mock:assembleRelease --stacktrace #publish ./gradlew :dokit-plugin:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-no-op:publishReleasePublicationToMavenCentralRepository -./gradlew :dokit-util:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-okhttp-api:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-okhttp-v3:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-okhttp-v4:publishReleasePublicationToMavenCentralRepository @@ -38,4 +38,7 @@ RES="\033[0m" ./gradlew :dokit-autotest:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-mc:publishReleasePublicationToMavenCentralRepository ./gradlew :dokit-weex:publishReleasePublicationToMavenCentralRepository +./gradlew :dokit-util:publishReleasePublicationToMavenCentralRepository +./gradlew :dokit-pthread-hook:publishReleasePublicationToMavenCentralRepository +./gradlew :dokit-gps-mock:publishReleasePublicationToMavenCentralRepository echo -e "${GREEN_COLOR} 打包上传到MavenCenter()仓库完成!!! ${RES}"