Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.9.17 #390

Open
wants to merge 4 commits into
base: dev-2311
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions oss-android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down Expand Up @@ -46,10 +46,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'
Expand Down
29 changes: 29 additions & 0 deletions oss-android-sdk/maven-publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' +
Expand All @@ -49,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")
}
}
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down