Skip to content
Merged
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#Changelog

## 7.0.1

### 增加
* 增加maven 一键发布

## 7.0.0 (2014-10-23)

### 增加
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@

## 安装

### 直接安装
将realease 目录中的jar 复制到项目中去,此版本sdk依赖 http://loopj.com/android-async-http/ 1.4.6及以上版本

### 通过maven
* 如果在Adroid Studio中使用,添加dependencies `compile 'com.qiniu:qiniu-android-sdk:7.0.0'` 或在项目中添加maven依赖
* 如果是eclipse, 也可以直接添加依赖来处理。

## 使用方法

```java
Expand Down
28 changes: 13 additions & 15 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
# Project-wide Gradle settings.
VERSION_NAME=
VERSION_CODE=

# IDE (e.g. Android Studio) users:
# Settings specified in this file will override any Gradle settings
# configured through the IDE.
GROUP=com.qiniu

# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
POM_DESCRIPTION=Qiniu Cloud Storage SDK for Android
POM_URL=https://github.com/qiniu/android-sdk
POM_SCM_URL=https://github.com/qiniu/android-sdk
POM_SCM_CONNECTION=scm:git@github.com:qiniu/android-sdk.git
POM_SCM_DEV_CONNECTION=scm:git@github.com:qiniu/android-sdk.git
POM_LICENCE_NAME=MIT License
POM_LICENCE_URL=http://opensource.org/licenses/MIT
POM_LICENCE_DIST=repo

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
POM_DEVELOPER_ID=qiniu
POM_DEVELOPER_NAME=Qiniu
7 changes: 6 additions & 1 deletion library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,9 @@ task releaseJar(type: Copy, dependsOn: 'build') {
into('../releases')
include('classes.jar')
rename('classes.jar', 'qiniu-android-sdk-' + version + '.jar')
}
}

setProperty('VERSION_NAME', version)
setProperty('VERSION_CODE', code)

apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
3 changes: 3 additions & 0 deletions library/library.iml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
Expand All @@ -77,7 +78,9 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
Expand Down
2 changes: 1 addition & 1 deletion library/src/main/java/com/qiniu/android/common/Config.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Created by bailong on 14/10/8.
*/
public final class Config {
public static final String VERSION = "7.0.0";
public static final String VERSION = "7.0.1";

public static final String UP_HOST = "upload.qiniu.com";
public static final String UP_HOST_BACKUP = "up.qiniu.com";
Expand Down
114 changes: 0 additions & 114 deletions maven_push.gradle

This file was deleted.