Merge pull request #1033 from didi/release/3.7.0

Release/3.7.0
didi · May 25, 2022 · edea679 · edea679
2 parents add5373 + 9f9f3ff
commit edea679
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git 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.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
@@ -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
@@ -18,27 +18,27 @@ 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
 ./gradlew :dokit-okhttp-api:publish --stacktrace
 ./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
@@ -15,21 +15,21 @@ 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
 ./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-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}"