From 35b1f9c33f8b7f09eb95b3ecdcf7cc92ae49987a Mon Sep 17 00:00:00 2001 From: jackjintai Date: Tue, 4 Aug 2020 17:19:57 +0800 Subject: [PATCH] =?UTF-8?q?android:=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/java/app/doraemonkit.gradle | 16 ++++++++-------- Android/java/config.gradle | 18 ++++++++++-------- .../java/doraemonkit-leakcanary/build.gradle | 6 +++++- .../doraemonkit-leakcanary/gradle.properties | 9 --------- .../upload-dev.gradle} | 18 +++++++++--------- .../upload-release.gradle | 15 +++++++++++++++ Android/java/doraemonkit-leakcanary/upload.sh | 6 ++++++ Android/java/doraemonkit-no-op/build.gradle | 6 +++++- .../java/doraemonkit-no-op/gradle.properties | 9 --------- .../{upload.gradle => upload-dev.gradle} | 18 +++++++++--------- .../doraemonkit-no-op/upload-release.gradle | 15 +++++++++++++++ Android/java/doraemonkit-no-op/upload.sh | 6 ++++++ Android/java/doraemonkit-plugin/build.gradle | 6 +++++- .../java/doraemonkit-plugin/gradle.properties | 9 --------- .../{upload.gradle => upload-dev.gradle} | 18 +++++++++--------- .../doraemonkit-plugin/upload-release.gradle | 15 +++++++++++++++ Android/java/doraemonkit-plugin/upload.sh | 6 ++++++ Android/java/doraemonkit-rpc/build.gradle | 8 ++++++-- Android/java/doraemonkit-rpc/gradle.properties | 9 --------- .../upload-dev.gradle} | 18 +++++++++--------- .../java/doraemonkit-rpc/upload-release.gradle | 15 +++++++++++++++ Android/java/doraemonkit-rpc/upload.sh | 6 ++++++ Android/java/doraemonkit-weex/build.gradle | 8 ++++++-- .../java/doraemonkit-weex/gradle.properties | 9 --------- .../{upload.gradle => upload-dev.gradle} | 18 +++++++++--------- .../doraemonkit-weex/upload-release.gradle | 15 +++++++++++++++ Android/java/doraemonkit-weex/upload.sh | 6 ++++++ Android/java/doraemonkit/build.gradle | 6 +++++- Android/java/doraemonkit/gradle.properties | 9 --------- .../{upload.gradle => upload-dev.gradle} | 18 +++++++++--------- Android/java/doraemonkit/upload-release.gradle | 15 +++++++++++++++ Android/java/doraemonkit/upload.sh | 6 ++++++ 32 files changed, 230 insertions(+), 132 deletions(-) delete mode 100644 Android/java/doraemonkit-leakcanary/gradle.properties rename Android/java/{doraemonkit-rpc/upload.gradle => doraemonkit-leakcanary/upload-dev.gradle} (75%) create mode 100644 Android/java/doraemonkit-leakcanary/upload-release.gradle create mode 100755 Android/java/doraemonkit-leakcanary/upload.sh delete mode 100644 Android/java/doraemonkit-no-op/gradle.properties rename Android/java/doraemonkit-no-op/{upload.gradle => upload-dev.gradle} (73%) create mode 100644 Android/java/doraemonkit-no-op/upload-release.gradle create mode 100755 Android/java/doraemonkit-no-op/upload.sh delete mode 100644 Android/java/doraemonkit-plugin/gradle.properties rename Android/java/doraemonkit-plugin/{upload.gradle => upload-dev.gradle} (75%) create mode 100644 Android/java/doraemonkit-plugin/upload-release.gradle create mode 100755 Android/java/doraemonkit-plugin/upload.sh delete mode 100644 Android/java/doraemonkit-rpc/gradle.properties rename Android/java/{doraemonkit-leakcanary/upload.gradle => doraemonkit-rpc/upload-dev.gradle} (75%) create mode 100644 Android/java/doraemonkit-rpc/upload-release.gradle create mode 100755 Android/java/doraemonkit-rpc/upload.sh delete mode 100644 Android/java/doraemonkit-weex/gradle.properties rename Android/java/doraemonkit-weex/{upload.gradle => upload-dev.gradle} (75%) create mode 100644 Android/java/doraemonkit-weex/upload-release.gradle create mode 100755 Android/java/doraemonkit-weex/upload.sh delete mode 100644 Android/java/doraemonkit/gradle.properties rename Android/java/doraemonkit/{upload.gradle => upload-dev.gradle} (75%) create mode 100644 Android/java/doraemonkit/upload-release.gradle create mode 100755 Android/java/doraemonkit/upload.sh diff --git a/Android/java/app/doraemonkit.gradle b/Android/java/app/doraemonkit.gradle index 129d8c03..f44c63a4 100644 --- a/Android/java/app/doraemonkit.gradle +++ b/Android/java/app/doraemonkit.gradle @@ -1,4 +1,4 @@ -if (rootProject.ext.config["applyPlugin"]) { +if (rootProject.ext.config["applyLocalModule"]) { // 引用插件 apply plugin: 'com.didi.dokit.debug' // apply plugin: 'com.didi.dokit' @@ -8,16 +8,16 @@ if (rootProject.ext.config["applyPlugin"]) { debugImplementation project(":doraemonkit") debugImplementation project(":doraemonkit-weex") releaseImplementation project(":doraemonkit-no-op") - debugImplementation project(":doraemonkit-leakcanary") - //新版线上包 -// debugImplementation "com.didichuxing.doraemonkit:doraemonkit:${rootProject.ext.android["jcenterArchivesVersionName"]}" -// debugImplementation "com.didichuxing.doraemonkit:doraemonkit-leakcanary:${rootProject.ext.android["jcenterArchivesVersionName"]}" -// releaseImplementation "com.didichuxing.doraemonkit:doraemonkit-no-op:${rootProject.ext.android["jcenterArchivesVersionName"]}" -// debugImplementation "com.didichuxing.doraemonkit:doraemonkit-weex:${rootProject.ext.android["jcenterArchivesVersionName"]}" - + //debugImplementation project(":doraemonkit-leakcanary") } } else { // 引用no-op的库 dependencies { + //新版线上包 + debugImplementation "com.didichuxing.doraemonkit:doraemonkit:${rootProject.ext.android["jcenterArchivesVersionName"]}" +// debugImplementation "com.didichuxing.doraemonkit:doraemonkit-leakcanary:${rootProject.ext.android["jcenterArchivesVersionName"]}" + releaseImplementation "com.didichuxing.doraemonkit:doraemonkit-no-op:${rootProject.ext.android["jcenterArchivesVersionName"]}" + debugImplementation "com.didichuxing.doraemonkit:doraemonkit-weex:${rootProject.ext.android["jcenterArchivesVersionName"]}" + } } \ No newline at end of file diff --git a/Android/java/config.gradle b/Android/java/config.gradle index dfe24b3a..7ea61f51 100755 --- a/Android/java/config.gradle +++ b/Android/java/config.gradle @@ -1,13 +1,15 @@ ext { config = [ - // 很多app都会有自己的打包开关，来区分线上包和测试包，可以通过给applyPlugin赋值来区分测试包和线上包 - // 线上包不会接入DoraemonKit，测试包会自动接入 - applyPlugin : true, - //上传到仓库时需要打开 - uploadArchives : false, - //是否发布插件到远程仓库 - publishPluginToRemote: false, - localRepoURL : "/Users/didi/project/dokit_repo" + // 是否依赖本地module + applyLocalModule : true, + //是否依赖线上社区的dokit 版本 上传到jcenter仓库时需要打开 + dependOnlineDokitVersion: false, + //是否发布插件到滴滴内部远程仓库 默认打包发布到 localRepoURL + publishDevEnvToRemote : false, + //发布到研发环境仓库 默认打包发布到 localRepoURL + publishDevEnvArchives : true, + //本地仓库地址 + localRepoURL : "/Users/didi/project/dokit_repo" ] android = [compileSdkVersion : 29, suppotrSdkVersion : "28.0.0", diff --git a/Android/java/doraemonkit-leakcanary/build.gradle b/Android/java/doraemonkit-leakcanary/build.gradle index 9365f250..f602bdc7 100644 --- a/Android/java/doraemonkit-leakcanary/build.gradle +++ b/Android/java/doraemonkit-leakcanary/build.gradle @@ -1,5 +1,9 @@ apply plugin: 'com.android.library' -apply from: 'upload.gradle' +if (rootProject.ext.config["publishDevEnvArchives"]) { + apply from: 'upload-dev.gradle' +} else { + apply from: 'upload-release.gradle' +} /** * 必须配置git path 否则会报Error:(29, 0) CreateProcess error=2, The system cannot find the file specified 错误 diff --git a/Android/java/doraemonkit-leakcanary/gradle.properties b/Android/java/doraemonkit-leakcanary/gradle.properties deleted file mode 100644 index 1f21fb8f..00000000 --- a/Android/java/doraemonkit-leakcanary/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -# 解决 http://tools.android.com/tech-docs/new-build-system/gradle-experimental 问题 -# android.useDeprecatedNdk=true -GROUP_ID=com.didichuxing.doraemonkit -ARTIFACT_ID=doraemonkit -VERSION=1000.0.0 -RELEASE_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/ -SNAPSHOT_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/ -USERNAME=deployment -PASSWORD=deployment123 \ No newline at end of file diff --git a/Android/java/doraemonkit-rpc/upload.gradle b/Android/java/doraemonkit-leakcanary/upload-dev.gradle similarity index 75% rename from Android/java/doraemonkit-rpc/upload.gradle rename to Android/java/doraemonkit-leakcanary/upload-dev.gradle index f7cafacf..6e5b52e6 100644 --- a/Android/java/doraemonkit-rpc/upload.gradle +++ b/Android/java/doraemonkit-leakcanary/upload-dev.gradle @@ -1,12 +1,12 @@ -def isRemote = rootProject.ext.config["publishPluginToRemote"] +def isRemote = rootProject.ext.config["publishDevEnvToRemote"] apply plugin: 'maven' if (isRemote) { uploadArchives { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-leakcanary" version rootProject.ext.android["jcenterArchivesVersionName"] } @@ -26,11 +26,11 @@ if (isRemote) { } - repository(url: project.RELEASE_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + repository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/") { + authentication(userName: "deployment", password: "deployment123") } - snapshotRepository(url: project.SNAPSHOT_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + snapshotRepository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/") { + authentication(userName: "deployment", password: "deployment123") } } } @@ -41,8 +41,8 @@ if (isRemote) { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-leakcanary" version rootProject.ext.android["jcenterArchivesVersionName"] } pom.withXml { diff --git a/Android/java/doraemonkit-leakcanary/upload-release.gradle b/Android/java/doraemonkit-leakcanary/upload-release.gradle new file mode 100644 index 00000000..d3a0f10a --- /dev/null +++ b/Android/java/doraemonkit-leakcanary/upload-release.gradle @@ -0,0 +1,15 @@ +apply plugin: 'com.novoda.bintray-release' +// 配置发布 # script +publish { + def groupProjectID = 'com.didichuxing.doraemonkit' + def artifactProjectID = 'doraemonkit-leakcanary' + def publishVersionID = "${rootProject.ext.android["jcenterArchivesVersionName"]}" + + userOrg = 'doraemonkit' + repoName = 'DoraemonKit' + groupId = groupProjectID + artifactId = artifactProjectID + publishVersion = publishVersionID + desc = '{library description}' + website = '{github_url}' +} \ No newline at end of file diff --git a/Android/java/doraemonkit-leakcanary/upload.sh b/Android/java/doraemonkit-leakcanary/upload.sh new file mode 100755 index 00000000..d220f431 --- /dev/null +++ b/Android/java/doraemonkit-leakcanary/upload.sh @@ -0,0 +1,6 @@ +#!/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/doraemonkit-no-op/build.gradle b/Android/java/doraemonkit-no-op/build.gradle index abfdb10a..b09f3803 100644 --- a/Android/java/doraemonkit-no-op/build.gradle +++ b/Android/java/doraemonkit-no-op/build.gradle @@ -1,7 +1,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply from: 'upload.gradle' +if (rootProject.ext.config["publishDevEnvArchives"]) { + apply from: 'upload-dev.gradle' +} else { + apply from: 'upload-release.gradle' +} android { compileSdkVersion rootProject.ext.android["compileSdkVersion"] diff --git a/Android/java/doraemonkit-no-op/gradle.properties b/Android/java/doraemonkit-no-op/gradle.properties deleted file mode 100644 index 79c266c0..00000000 --- a/Android/java/doraemonkit-no-op/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -# 解决 http://tools.android.com/tech-docs/new-build-system/gradle-experimental 问题 -# android.useDeprecatedNdk=true -GROUP_ID=com.didichuxing.doraemonkit -ARTIFACT_ID=doraemonkit-no-op -VERSION=1000.0.0 -RELEASE_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/ -SNAPSHOT_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/ -USERNAME=deployment -PASSWORD=deployment123 \ No newline at end of file diff --git a/Android/java/doraemonkit-no-op/upload.gradle b/Android/java/doraemonkit-no-op/upload-dev.gradle similarity index 73% rename from Android/java/doraemonkit-no-op/upload.gradle rename to Android/java/doraemonkit-no-op/upload-dev.gradle index 05e1031f..1f5ea3c0 100644 --- a/Android/java/doraemonkit-no-op/upload.gradle +++ b/Android/java/doraemonkit-no-op/upload-dev.gradle @@ -1,12 +1,12 @@ -def isRemote = rootProject.ext.config["publishPluginToRemote"] +def isRemote = rootProject.ext.config["publishDevEnvToRemote"] apply plugin: 'maven' if(isRemote){ uploadArchives { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-no-op" version rootProject.ext.android["jcenterArchivesVersionName"] } @@ -26,11 +26,11 @@ if(isRemote){ } - repository(url: project.RELEASE_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + repository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/") { + authentication(userName: "deployment", password: "deployment123") } - snapshotRepository(url: project.SNAPSHOT_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + snapshotRepository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/") { + authentication(userName: "deployment", password: "deployment123") } } } @@ -41,8 +41,8 @@ if(isRemote){ repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-no-op" version rootProject.ext.android["jcenterArchivesVersionName"] } pom.withXml { diff --git a/Android/java/doraemonkit-no-op/upload-release.gradle b/Android/java/doraemonkit-no-op/upload-release.gradle new file mode 100644 index 00000000..e43e8070 --- /dev/null +++ b/Android/java/doraemonkit-no-op/upload-release.gradle @@ -0,0 +1,15 @@ +apply plugin: 'com.novoda.bintray-release' +// 配置发布 # script +publish { + def groupProjectID = 'com.didichuxing.doraemonkit' + def artifactProjectID = 'doraemonkit-no-op' + def publishVersionID = "${rootProject.ext.android["jcenterArchivesVersionName"]}" + + userOrg = 'doraemonkit' + repoName = 'DoraemonKit' + groupId = groupProjectID + artifactId = artifactProjectID + publishVersion = publishVersionID + desc = '{library description}' + website = '{github_url}' +} \ No newline at end of file diff --git a/Android/java/doraemonkit-no-op/upload.sh b/Android/java/doraemonkit-no-op/upload.sh new file mode 100755 index 00000000..d220f431 --- /dev/null +++ b/Android/java/doraemonkit-no-op/upload.sh @@ -0,0 +1,6 @@ +#!/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/doraemonkit-plugin/build.gradle b/Android/java/doraemonkit-plugin/build.gradle index 91100c67..2ddbbac0 100644 --- a/Android/java/doraemonkit-plugin/build.gradle +++ b/Android/java/doraemonkit-plugin/build.gradle @@ -1,6 +1,10 @@ apply plugin: 'kotlin' apply plugin: 'kotlin-kapt' -apply from: 'upload.gradle' +if (rootProject.ext.config["publishDevEnvArchives"]) { + apply from: 'upload-dev.gradle' +} else { + apply from: 'upload-release.gradle' +} sourceSets { main { diff --git a/Android/java/doraemonkit-plugin/gradle.properties b/Android/java/doraemonkit-plugin/gradle.properties deleted file mode 100644 index 4ca3d2ee..00000000 --- a/Android/java/doraemonkit-plugin/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -# 解决 http://tools.android.com/tech-docs/new-build-system/gradle-experimental 问题 -# android.useDeprecatedNdk=true -GROUP_ID=com.didichuxing.doraemonkit -ARTIFACT_ID=doraemonkit-plugin -VERSION=1000.0.0 -RELEASE_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/ -SNAPSHOT_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/ -USERNAME=deployment -PASSWORD=deployment123 \ No newline at end of file diff --git a/Android/java/doraemonkit-plugin/upload.gradle b/Android/java/doraemonkit-plugin/upload-dev.gradle similarity index 75% rename from Android/java/doraemonkit-plugin/upload.gradle rename to Android/java/doraemonkit-plugin/upload-dev.gradle index b7035e76..8415efc5 100644 --- a/Android/java/doraemonkit-plugin/upload.gradle +++ b/Android/java/doraemonkit-plugin/upload-dev.gradle @@ -1,12 +1,12 @@ -def isRemote = rootProject.ext.config["publishPluginToRemote"] +def isRemote = rootProject.ext.config["publishDevEnvToRemote"] apply plugin: 'maven' if (isRemote) { uploadArchives { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-plugin" version rootProject.ext.android["pluginVersionName"] } @@ -26,11 +26,11 @@ if (isRemote) { } - repository(url: project.RELEASE_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + repository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/") { + authentication(userName: "deployment", password: "deployment123") } - snapshotRepository(url: project.SNAPSHOT_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + snapshotRepository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/") { + authentication(userName: "deployment", password: "deployment123") } } } @@ -41,8 +41,8 @@ if (isRemote) { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-plugin" version rootProject.ext.android["pluginVersionName"] } pom.withXml { diff --git a/Android/java/doraemonkit-plugin/upload-release.gradle b/Android/java/doraemonkit-plugin/upload-release.gradle new file mode 100644 index 00000000..fe276495 --- /dev/null +++ b/Android/java/doraemonkit-plugin/upload-release.gradle @@ -0,0 +1,15 @@ +apply plugin: 'com.novoda.bintray-release' +// 配置发布 # script +publish { + def groupProjectID = 'com.didichuxing.doraemonkit' + def artifactProjectID = 'doraemonkit-plugin' + def publishVersionID = "${rootProject.ext.android["pluginVersionName"]}" + + userOrg = 'doraemonkit' + repoName = 'DoraemonKit' + groupId = groupProjectID + artifactId = artifactProjectID + publishVersion = publishVersionID + desc = '{library description}' + website = '{github_url}' +} \ No newline at end of file diff --git a/Android/java/doraemonkit-plugin/upload.sh b/Android/java/doraemonkit-plugin/upload.sh new file mode 100755 index 00000000..d220f431 --- /dev/null +++ b/Android/java/doraemonkit-plugin/upload.sh @@ -0,0 +1,6 @@ +#!/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/doraemonkit-rpc/build.gradle b/Android/java/doraemonkit-rpc/build.gradle index dae71e4b..1dd4660a 100644 --- a/Android/java/doraemonkit-rpc/build.gradle +++ b/Android/java/doraemonkit-rpc/build.gradle @@ -1,7 +1,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply from: './upload.gradle' +if (rootProject.ext.config["publishDevEnvArchives"]) { + apply from: 'upload-dev.gradle' +} else { + apply from: 'upload-release.gradle' +} android { compileSdkVersion rootProject.ext.android["compileSdkVersion"] @@ -55,7 +59,7 @@ dependencies { compileOnly rootProject.ext.dependencies["didi_http"] compileOnly rootProject.ext.dependencies["didi_rpc"] //此处需要使用api的形式 向上暴露内部api - if (rootProject.ext.config["uploadArchives"]) { + if (rootProject.ext.config["dependOnlineDokitVersion"]) { api "com.didichuxing.doraemonkit:doraemonkit:${rootProject.ext.android["jcenterArchivesVersionName"]}" } else { api project(':doraemonkit') diff --git a/Android/java/doraemonkit-rpc/gradle.properties b/Android/java/doraemonkit-rpc/gradle.properties deleted file mode 100644 index 4f716f80..00000000 --- a/Android/java/doraemonkit-rpc/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -# 解决 http://tools.android.com/tech-docs/new-build-system/gradle-experimental 问题 -# android.useDeprecatedNdk=true -GROUP_ID=com.didichuxing.doraemonkit -ARTIFACT_ID=doraemonkit-rpc -VERSION=1000.0.0 -RELEASE_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/ -SNAPSHOT_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/ -USERNAME=deployment -PASSWORD=deployment123 \ No newline at end of file diff --git a/Android/java/doraemonkit-leakcanary/upload.gradle b/Android/java/doraemonkit-rpc/upload-dev.gradle similarity index 75% rename from Android/java/doraemonkit-leakcanary/upload.gradle rename to Android/java/doraemonkit-rpc/upload-dev.gradle index f7cafacf..178a8df7 100644 --- a/Android/java/doraemonkit-leakcanary/upload.gradle +++ b/Android/java/doraemonkit-rpc/upload-dev.gradle @@ -1,12 +1,12 @@ -def isRemote = rootProject.ext.config["publishPluginToRemote"] +def isRemote = rootProject.ext.config["publishDevEnvToRemote"] apply plugin: 'maven' if (isRemote) { uploadArchives { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-rpc" version rootProject.ext.android["jcenterArchivesVersionName"] } @@ -26,11 +26,11 @@ if (isRemote) { } - repository(url: project.RELEASE_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + repository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/") { + authentication(userName: "deployment", password: "deployment123") } - snapshotRepository(url: project.SNAPSHOT_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + snapshotRepository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/") { + authentication(userName: "deployment", password: "deployment123") } } } @@ -41,8 +41,8 @@ if (isRemote) { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-rpc" version rootProject.ext.android["jcenterArchivesVersionName"] } pom.withXml { diff --git a/Android/java/doraemonkit-rpc/upload-release.gradle b/Android/java/doraemonkit-rpc/upload-release.gradle new file mode 100644 index 00000000..bb3a8796 --- /dev/null +++ b/Android/java/doraemonkit-rpc/upload-release.gradle @@ -0,0 +1,15 @@ +apply plugin: 'com.novoda.bintray-release' +// 配置发布 # script +publish { + def groupProjectID = 'com.didichuxing.doraemonkit' + def artifactProjectID = 'doraemonkit-rpc' + def publishVersionID = "${rootProject.ext.android["jcenterArchivesVersionName"]}" + + userOrg = 'doraemonkit' + repoName = 'DoraemonKit' + groupId = groupProjectID + artifactId = artifactProjectID + publishVersion = publishVersionID + desc = '{library description}' + website = '{github_url}' +} \ No newline at end of file diff --git a/Android/java/doraemonkit-rpc/upload.sh b/Android/java/doraemonkit-rpc/upload.sh new file mode 100755 index 00000000..d220f431 --- /dev/null +++ b/Android/java/doraemonkit-rpc/upload.sh @@ -0,0 +1,6 @@ +#!/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/doraemonkit-weex/build.gradle b/Android/java/doraemonkit-weex/build.gradle index fcab0a9e..0a518f13 100644 --- a/Android/java/doraemonkit-weex/build.gradle +++ b/Android/java/doraemonkit-weex/build.gradle @@ -1,5 +1,9 @@ apply plugin: 'com.android.library' -apply from: './upload.gradle' +if (rootProject.ext.config["publishDevEnvArchives"]) { + apply from: 'upload-dev.gradle' +} else { + apply from: 'upload-release.gradle' +} android { compileSdkVersion rootProject.ext.android["compileSdkVersion"] @@ -39,7 +43,7 @@ dependencies { implementation rootProject.ext.dependencies["constraintLayout"] implementation rootProject.ext.dependencies["design"] implementation rootProject.ext.dependencies["utilcode"] - if (rootProject.ext.config["uploadArchives"]) { + if (rootProject.ext.config["dependOnlineDokitVersion"]) { implementation "com.didichuxing.doraemonkit:doraemonkit:${rootProject.ext.android["jcenterArchivesVersionName"]}" } else { implementation project(':doraemonkit') diff --git a/Android/java/doraemonkit-weex/gradle.properties b/Android/java/doraemonkit-weex/gradle.properties deleted file mode 100644 index 005c10ae..00000000 --- a/Android/java/doraemonkit-weex/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -# 解决 http://tools.android.com/tech-docs/new-build-system/gradle-experimental 问题 -# android.useDeprecatedNdk=true -GROUP_ID=com.didichuxing.doraemonkit -ARTIFACT_ID=doraemonkit-weex -VERSION=1000.0.0 -RELEASE_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/ -SNAPSHOT_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/ -USERNAME=deployment -PASSWORD=deployment123 \ No newline at end of file diff --git a/Android/java/doraemonkit-weex/upload.gradle b/Android/java/doraemonkit-weex/upload-dev.gradle similarity index 75% rename from Android/java/doraemonkit-weex/upload.gradle rename to Android/java/doraemonkit-weex/upload-dev.gradle index 29c85c17..56d64c5a 100644 --- a/Android/java/doraemonkit-weex/upload.gradle +++ b/Android/java/doraemonkit-weex/upload-dev.gradle @@ -1,12 +1,12 @@ -def isRemote = rootProject.ext.config["publishPluginToRemote"] +def isRemote = rootProject.ext.config["publishDevEnvToRemote"] apply plugin: 'maven' if(isRemote){ uploadArchives { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-weex" version rootProject.ext.android["jcenterArchivesVersionName"] } @@ -26,11 +26,11 @@ if(isRemote){ } - repository(url: project.RELEASE_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + repository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/") { + authentication(userName: "deployment", password: "deployment123") } - snapshotRepository(url: project.SNAPSHOT_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + snapshotRepository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/") { + authentication(userName: "deployment", password: "deployment123") } } } @@ -41,8 +41,8 @@ if(isRemote){ repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit-weex" version rootProject.ext.android["jcenterArchivesVersionName"] } pom.withXml { diff --git a/Android/java/doraemonkit-weex/upload-release.gradle b/Android/java/doraemonkit-weex/upload-release.gradle new file mode 100644 index 00000000..9db026cf --- /dev/null +++ b/Android/java/doraemonkit-weex/upload-release.gradle @@ -0,0 +1,15 @@ +apply plugin: 'com.novoda.bintray-release' +// 配置发布 # script +publish { + def groupProjectID = 'com.didichuxing.doraemonkit' + def artifactProjectID = 'doraemonkit-weex' + def publishVersionID = "${rootProject.ext.android["jcenterArchivesVersionName"]}" + + userOrg = 'doraemonkit' + repoName = 'DoraemonKit' + groupId = groupProjectID + artifactId = artifactProjectID + publishVersion = publishVersionID + desc = '{library description}' + website = '{github_url}' +} \ No newline at end of file diff --git a/Android/java/doraemonkit-weex/upload.sh b/Android/java/doraemonkit-weex/upload.sh new file mode 100755 index 00000000..d220f431 --- /dev/null +++ b/Android/java/doraemonkit-weex/upload.sh @@ -0,0 +1,6 @@ +#!/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/doraemonkit/build.gradle b/Android/java/doraemonkit/build.gradle index 578763d8..2f9b7e0f 100644 --- a/Android/java/doraemonkit/build.gradle +++ b/Android/java/doraemonkit/build.gradle @@ -2,7 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -apply from: 'upload.gradle' +if (rootProject.ext.config["publishDevEnvArchives"]) { + apply from: 'upload-dev.gradle' +} else { + apply from: 'upload-release.gradle' +} android { compileSdkVersion rootProject.ext.android["compileSdkVersion"] diff --git a/Android/java/doraemonkit/gradle.properties b/Android/java/doraemonkit/gradle.properties deleted file mode 100644 index 1f21fb8f..00000000 --- a/Android/java/doraemonkit/gradle.properties +++ /dev/null @@ -1,9 +0,0 @@ -# 解决 http://tools.android.com/tech-docs/new-build-system/gradle-experimental 问题 -# android.useDeprecatedNdk=true -GROUP_ID=com.didichuxing.doraemonkit -ARTIFACT_ID=doraemonkit -VERSION=1000.0.0 -RELEASE_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/ -SNAPSHOT_REPOSITORY_URL=http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/ -USERNAME=deployment -PASSWORD=deployment123 \ No newline at end of file diff --git a/Android/java/doraemonkit/upload.gradle b/Android/java/doraemonkit/upload-dev.gradle similarity index 75% rename from Android/java/doraemonkit/upload.gradle rename to Android/java/doraemonkit/upload-dev.gradle index be3adb25..d805d932 100644 --- a/Android/java/doraemonkit/upload.gradle +++ b/Android/java/doraemonkit/upload-dev.gradle @@ -1,12 +1,12 @@ -def isRemote = rootProject.ext.config["publishPluginToRemote"] +def isRemote = rootProject.ext.config["publishDevEnvToRemote"] apply plugin: 'maven' if (isRemote) { uploadArchives { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit" version rootProject.ext.android["jcenterArchivesVersionName"] } @@ -26,11 +26,11 @@ if (isRemote) { } - repository(url: project.RELEASE_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + repository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-release/") { + authentication(userName: "deployment", password: "deployment123") } - snapshotRepository(url: project.SNAPSHOT_REPOSITORY_URL) { - authentication(userName: project.USERNAME, password: project.PASSWORD) + snapshotRepository(url: "http://artifactory.intra.xiaojukeji.com/artifactory/libs-snapshot/") { + authentication(userName: "deployment", password: "deployment123") } } } @@ -41,8 +41,8 @@ if (isRemote) { repositories { mavenDeployer { pom.project { - groupId project.GROUP_ID - artifactId project.ARTIFACT_ID + groupId "com.didichuxing.doraemonkit" + artifactId "doraemonkit" version rootProject.ext.android["jcenterArchivesVersionName"] } pom.withXml { diff --git a/Android/java/doraemonkit/upload-release.gradle b/Android/java/doraemonkit/upload-release.gradle new file mode 100644 index 00000000..1efea005 --- /dev/null +++ b/Android/java/doraemonkit/upload-release.gradle @@ -0,0 +1,15 @@ +apply plugin: 'com.novoda.bintray-release' +// 配置发布 # script +publish { + def groupProjectID = 'com.didichuxing.doraemonkit' + def artifactProjectID = 'doraemonkit' + def publishVersionID = "${rootProject.ext.android["jcenterArchivesVersionName"]}" + + userOrg = 'doraemonkit' + repoName = 'DoraemonKit' + groupId = groupProjectID + artifactId = artifactProjectID + publishVersion = publishVersionID + desc = '{library description}' + website = '{github_url}' +} \ No newline at end of file diff --git a/Android/java/doraemonkit/upload.sh b/Android/java/doraemonkit/upload.sh new file mode 100755 index 00000000..d220f431 --- /dev/null +++ b/Android/java/doraemonkit/upload.sh @@ -0,0 +1,6 @@ +#!/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 -- GitLab