Merge pull request #43 from qiniu/develop

Release 6.0.2

Author: longbai

.gitignore

@@ -1,77 +1,10 @@
-# Go Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-Config.java.test
+# Gradle
+build/
+.gradle
 
-# Folders
-_obj
-_test
-target
+#Java
+.class
 
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.out
-*.pyc
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.class
-python/qbox/config.weico.py
-fopext/go/demo/fopext_demo
-2_output_s.jpg
-2_thumb_s.jpg
-2.jpg
-
-# rcov generated
-coverage
-
-# rdoc generated
-rdoc
-
-# bundler
-.bundle
-
-# jeweler generated
-pkg
-
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
-#
-# * Create a file at ~/.gitignore
-# * Include files you want ignored
-# * Run: git config --global core.excludesfile ~/.gitignore
-#
-# After doing this, these files will be ignored in all your git projects,
-# saving you from having to 'pollute' every project you touch with them
-#
-# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
-#
-# For MacOS:
-#
-.DS_Store
-
-# For vim:
-*.swp
-
-# for intellij
-.idea/*
-out/*
-
-# intellij idea
-local.properties
-android-sdk.iml
-ant.properties
-proguard-project.txt
-.classpath
-.project
-project.properties
-build.xml
-gen/*
+#Android
+.apk
+.dex

.travis.yml

@@ -0,0 +1,35 @@
+language: java
+jdk: oraclejdk7
+env:
+  matrix:
+    - ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
+before_install:
+  # Install base Android SDK
+  - chmod +x gradlew
+  - sudo apt-get update -qq
+  - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
+  - wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
+  - tar xzf android-sdk_r22.3-linux.tgz
+  - export ANDROID_HOME=$PWD/android-sdk-linux
+  - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+
+  # Install required components.
+  # For a full list, run `android list sdk -a --extended`
+  # Note that sysimg-19 downloads only ARM, because only the first license query is accepted.
+  - echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
+  - echo yes | android update sdk --all --filter build-tools-19.0.0 --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
+  - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
+
+  # Create and start emulator
+  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+  - emulator -avd test -no-skin -no-audio -no-window &
+
+before_script:
+  - adb wait-for-device
+  - adb shell input keyevent 82 &
+
+script:
+  - ./gradlew build

CHANGELOG.md

@@ -1,5 +1,11 @@
 ## CHANGE LOG
 
+### v6.0.2
+2014-04-15 issue [#43](https://github.com/qiniu/android-sdk/pull/43)
+
+- [#41] gradle build, travis
+
+
 ### v6.0.1
 2014-04-03 issue [#40](https://github.com/qiniu/android-sdk/pull/40)
 

README.md

@@ -1,7 +1,9 @@
 Qiniu Resource Storage SDK for Android
 ===
 
-[![Qiniu Logo](http://qiniutek.com/images/logo-2.png)](http://qiniu.com/)
+[![Build Status](https://api.travis-ci.org/qiniu/android-sdk.png?branch=master)](https://travis-ci.org/qiniu/android-sdk)
+
+[![Qiniu Logo](http://qiniu-brand.qiniudn.com/5/logo-white-195x105.png)](http://www.qiniu.com/)
 
 ## 下载
 

build.gradle

@@ -0,0 +1,33 @@
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath 'com.android.tools.build:gradle:0.8+'
+  }
+}
+
+apply plugin: 'android'
+
+android {
+  compileSdkVersion 19
+  buildToolsVersion '19'
+
+  sourceSets {
+    main {
+      manifest.srcFile 'AndroidManifest.xml'
+      java.srcDirs = ['src']
+      resources.srcDirs = ['src']
+      renderscript.srcDirs = ['src']
+      res.srcDirs = ['res']
+      assets.srcDirs = ['assets']
+    }
+
+    instrumentTest.setRoot('tests')
+  }
+
+  dependencies {
+    compile fileTree(dir: 'libs', include: '*.jar')
+  }
+}

gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,6 @@
+#Tue Apr 15 11:16:04 CST 2014
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip