From dd3d566ce06be25c97692d8865bd2546a065e06b Mon Sep 17 00:00:00 2001 From: ws Date: Wed, 8 Nov 2023 18:26:43 +0800 Subject: [PATCH 1/4] Modify Publishing Script --- oss-android-sdk/maven-publish.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oss-android-sdk/maven-publish.gradle b/oss-android-sdk/maven-publish.gradle index 838428b9..369286fc 100644 --- a/oss-android-sdk/maven-publish.gradle +++ b/oss-android-sdk/maven-publish.gradle @@ -23,6 +23,8 @@ publishing { artifactId projectArtifactId version projectVersionName + artifact("$buildDir/outputs/aar/oss-android-sdk-release.aar") + pom { name = projectName description = 'Aliyun Open Services SDK for Android\n' + From 75b67a95201d79a0d1f6930cd3b66292d1adb72a Mon Sep 17 00:00:00 2001 From: ws Date: Wed, 8 Nov 2023 18:29:41 +0800 Subject: [PATCH 2/4] Modify the information of version 2.9.17 --- changelog.txt | 7 ++++++- oss-android-sdk/build.gradle | 2 +- .../com/alibaba/sdk/android/oss/common/OSSConstants.java | 2 +- project.properties | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/changelog.txt b/changelog.txt index aac6cf10..b130918f 100755 --- a/changelog.txt +++ b/changelog.txt @@ -16,7 +16,12 @@ Github地址：https://github.com/aliyun/aliyun-oss-android-sdk 更新日志: -202311/2 + +2023/11/8 +- release 2.9.17 +1.Modify Publishing Script + +2023/11/2 - release 2.9.16 1.Modify publishing method 2.Modify the file path when deleting logs and crc files diff --git a/oss-android-sdk/build.gradle b/oss-android-sdk/build.gradle index 15f739c0..f7fea3a9 100644 --- a/oss-android-sdk/build.gradle +++ b/oss-android-sdk/build.gradle @@ -16,7 +16,7 @@ android { minSdkVersion 14 targetSdkVersion 30 versionCode 40 - versionName "2.9.16" + versionName "2.9.17" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/oss-android-sdk/src/main/java/com/alibaba/sdk/android/oss/common/OSSConstants.java b/oss-android-sdk/src/main/java/com/alibaba/sdk/android/oss/common/OSSConstants.java index 0f3a47a2..adf381b3 100644 --- a/oss-android-sdk/src/main/java/com/alibaba/sdk/android/oss/common/OSSConstants.java +++ b/oss-android-sdk/src/main/java/com/alibaba/sdk/android/oss/common/OSSConstants.java @@ -5,7 +5,7 @@ */ public final class OSSConstants { - public static final String SDK_VERSION = "2.9.16"; + public static final String SDK_VERSION = "2.9.17"; public static final String DEFAULT_OSS_ENDPOINT = "http://oss-cn-hangzhou.aliyuncs.com"; public static final String DEFAULT_CHARSET_NAME = "utf-8"; diff --git a/project.properties b/project.properties index 8774517c..91dc2d5d 100644 --- a/project.properties +++ b/project.properties @@ -2,7 +2,7 @@ project.name=aliyun-oss-sdk-android project.groupId=com.aliyun.dpa project.artifactId=oss-android-sdk -project.version=2.9.16 +project.version=2.9.17 project.packaging=aar project.siteUrl=https://github.com/aliyun/aliyun-oss-android-sdk project.gitUrl=https://github.com/aliyun/aliyun-oss-android-sdk.git From a316d82c0380e23a361a82e828ff475976ebcbf0 Mon Sep 17 00:00:00 2001 From: ws Date: Thu, 9 Nov 2023 10:42:10 +0800 Subject: [PATCH 3/4] Modify Dependency Method --- oss-android-sdk/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oss-android-sdk/build.gradle b/oss-android-sdk/build.gradle index f7fea3a9..e4157606 100644 --- a/oss-android-sdk/build.gradle +++ b/oss-android-sdk/build.gradle @@ -47,9 +47,9 @@ repositories { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'com.squareup.okhttp3:okhttp:3.11.0' + implementation 'com.squareup.okio:okio:1.14.0' testImplementation 'junit:junit:4.12' - api 'com.squareup.okhttp3:okhttp:3.11.0' - api 'com.squareup.okio:okio:1.14.0' androidTestImplementation 'com.parse.bolts:bolts-tasks:1.3.0' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test:rules:1.0.2' From d43f11c2fbb799b243a00f96969995e0347d6a49 Mon Sep 17 00:00:00 2001 From: ws Date: Thu, 9 Nov 2023 11:07:23 +0800 Subject: [PATCH 4/4] Modify the generated content of the pom file --- oss-android-sdk/build.gradle | 1 - oss-android-sdk/maven-publish.gradle | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/oss-android-sdk/build.gradle b/oss-android-sdk/build.gradle index e4157606..204e44c0 100644 --- a/oss-android-sdk/build.gradle +++ b/oss-android-sdk/build.gradle @@ -46,7 +46,6 @@ repositories { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.squareup.okhttp3:okhttp:3.11.0' implementation 'com.squareup.okio:okio:1.14.0' testImplementation 'junit:junit:4.12' diff --git a/oss-android-sdk/maven-publish.gradle b/oss-android-sdk/maven-publish.gradle index 369286fc..26749c11 100644 --- a/oss-android-sdk/maven-publish.gradle +++ b/oss-android-sdk/maven-publish.gradle @@ -51,6 +51,33 @@ publishing { developerConnection = "scm:git:ssh://github.com/aliyun/aliyun-oss-android-sdk.git" url = "https://github.com/aliyun/aliyun-oss-android-sdk" } + + withXml { + def dependenciesNode = asNode().appendNode('dependencies') + project.configurations.all { configuration -> + def name = configuration.name + if (name != "implementation" && name != "compile" && name != "api") { + return + } + println(configuration) + configuration.dependencies.each { + println(it) + if (it.name == "unspecified" || it.version == 'unspecified') { + // 忽略无法识别的 + return + } + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + if (name == "api" || name == "compile") { + dependencyNode.appendNode("scope", "compile") + } else { // implementation + dependencyNode.appendNode("scope", "runtime") + } + } + } + } } } }