Skip to content

Commit 6b06f30

Browse files
longbailongbai
committed
Merge pull request #43 from qiniu/develop
Release 6.0.2
2 parents a4c0fcf + 5cc9d1a commit 6b06f30

10 files changed

+359
-76
lines changed

‎.gitignore

Lines changed: 8 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,10 @@
1-
# Go Compiled Object files, Static and Dynamic libs (Shared Objects)
2-
*.o
3-
*.a
4-
*.so
5-
Config.java.test
1+
# Gradle
2+
build/
3+
.gradle
64

7-
# Folders
8-
_obj
9-
_test
10-
target
5+
#Java
6+
.class
117

12-
# Architecture specific extensions/prefixes
13-
*.[568vq]
14-
[568vq].out
15-
16-
*.out
17-
*.pyc
18-
*.cgo1.go
19-
*.cgo2.c
20-
_cgo_defun.c
21-
_cgo_gotypes.go
22-
_cgo_export.*
23-
24-
_testmain.go
25-
26-
*.exe
27-
*.class
28-
python/qbox/config.weico.py
29-
fopext/go/demo/fopext_demo
30-
2_output_s.jpg
31-
2_thumb_s.jpg
32-
2.jpg
33-
34-
# rcov generated
35-
coverage
36-
37-
# rdoc generated
38-
rdoc
39-
40-
# bundler
41-
.bundle
42-
43-
# jeweler generated
44-
pkg
45-
46-
# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
47-
#
48-
# * Create a file at ~/.gitignore
49-
# * Include files you want ignored
50-
# * Run: git config --global core.excludesfile ~/.gitignore
51-
#
52-
# After doing this, these files will be ignored in all your git projects,
53-
# saving you from having to 'pollute' every project you touch with them
54-
#
55-
# 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)
56-
#
57-
# For MacOS:
58-
#
59-
.DS_Store
60-
61-
# For vim:
62-
*.swp
63-
64-
# for intellij
65-
.idea/*
66-
out/*
67-
68-
# intellij idea
69-
local.properties
70-
android-sdk.iml
71-
ant.properties
72-
proguard-project.txt
73-
.classpath
74-
.project
75-
project.properties
76-
build.xml
77-
gen/*
8+
#Android
9+
.apk
10+
.dex

‎.travis.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
language: java
2+
jdk: oraclejdk7
3+
env:
4+
matrix:
5+
- ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
6+
before_install:
7+
# Install base Android SDK
8+
- chmod +x gradlew
9+
- sudo apt-get update -qq
10+
- if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi
11+
- wget http://dl.google.com/android/android-sdk_r22.3-linux.tgz
12+
- tar xzf android-sdk_r22.3-linux.tgz
13+
- export ANDROID_HOME=$PWD/android-sdk-linux
14+
- export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
15+
16+
# Install required components.
17+
# For a full list, run `android list sdk -a --extended`
18+
# Note that sysimg-19 downloads only ARM, because only the first license query is accepted.
19+
- echo yes | android update sdk --filter platform-tools --no-ui --force > /dev/null
20+
- echo yes | android update sdk --all --filter build-tools-19.0.0 --no-ui --force > /dev/null
21+
- echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
22+
- echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null
23+
- echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
24+
- echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
25+
26+
# Create and start emulator
27+
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
28+
- emulator -avd test -no-skin -no-audio -no-window &
29+
30+
before_script:
31+
- adb wait-for-device
32+
- adb shell input keyevent 82 &
33+
34+
script:
35+
- ./gradlew build

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## CHANGE LOG
22

3+
### v6.0.2
4+
2014-04-15 issue [#43](https://github.com/qiniu/android-sdk/pull/43)
5+
6+
- [#41] gradle build, travis
7+
8+
39
### v6.0.1
410
2014-04-03 issue [#40](https://github.com/qiniu/android-sdk/pull/40)
511

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
Qiniu Resource Storage SDK for Android
22
===
33

4-
[![Qiniu Logo](http://qiniutek.com/images/logo-2.png)](http://qiniu.com/)
4+
[![Build Status](https://api.travis-ci.org/qiniu/android-sdk.png?branch=master)](https://travis-ci.org/qiniu/android-sdk)
5+
6+
[![Qiniu Logo](http://qiniu-brand.qiniudn.com/5/logo-white-195x105.png)](http://www.qiniu.com/)
57

68
## 下载
79

‎build.gradle

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
6+
dependencies {
7+
classpath 'com.android.tools.build:gradle:0.8+'
8+
}
9+
}
10+
11+
apply plugin: 'android'
12+
13+
android {
14+
compileSdkVersion 19
15+
buildToolsVersion '19'
16+
17+
sourceSets {
18+
main {
19+
manifest.srcFile 'AndroidManifest.xml'
20+
java.srcDirs = ['src']
21+
resources.srcDirs = ['src']
22+
renderscript.srcDirs = ['src']
23+
res.srcDirs = ['res']
24+
assets.srcDirs = ['assets']
25+
}
26+
27+
instrumentTest.setRoot('tests')
28+
}
29+
30+
dependencies {
31+
compile fileTree(dir: 'libs', include: '*.jar')
32+
}
33+
}

‎gradle/wrapper/gradle-wrapper.jar

49.9 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Tue Apr 15 11:16:04 CST 2014
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip

‎gradlew

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
#!/usr/bin/env bash
2+
3+
##############################################################################
4+
##
5+
## Gradle start up script for UN*X
6+
##
7+
##############################################################################
8+
9+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10+
DEFAULT_JVM_OPTS=""
11+
12+
APP_NAME="Gradle"
13+
APP_BASE_NAME=`basename "$0"`
14+
15+
# Use the maximum available, or set MAX_FD != -1 to use that value.
16+
MAX_FD="maximum"
17+
18+
warn ( ) {
19+
echo "$*"
20+
}
21+
22+
die ( ) {
23+
echo
24+
echo "$*"
25+
echo
26+
exit 1
27+
}
28+
29+
# OS specific support (must be 'true' or 'false').
30+
cygwin=false
31+
msys=false
32+
darwin=false
33+
case "`uname`" in
34+
CYGWIN* )
35+
cygwin=true
36+
;;
37+
Darwin* )
38+
darwin=true
39+
;;
40+
MINGW* )
41+
msys=true
42+
;;
43+
esac
44+
45+
# For Cygwin, ensure paths are in UNIX format before anything is touched.
46+
if $cygwin ; then
47+
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
48+
fi
49+
50+
# Attempt to set APP_HOME
51+
# Resolve links: $0 may be a link
52+
PRG="$0"
53+
# Need this for relative symlinks.
54+
while [ -h "$PRG" ] ; do
55+
ls=`ls -ld "$PRG"`
56+
link=`expr "$ls" : '.*-> \(.*\)$'`
57+
if expr "$link" : '/.*' > /dev/null; then
58+
PRG="$link"
59+
else
60+
PRG=`dirname "$PRG"`"/$link"
61+
fi
62+
done
63+
SAVED="`pwd`"
64+
cd "`dirname \"$PRG\"`/" >&-
65+
APP_HOME="`pwd -P`"
66+
cd "$SAVED" >&-
67+
68+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
69+
70+
# Determine the Java command to use to start the JVM.
71+
if [ -n "$JAVA_HOME" ] ; then
72+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
73+
# IBM's JDK on AIX uses strange locations for the executables
74+
JAVACMD="$JAVA_HOME/jre/sh/java"
75+
else
76+
JAVACMD="$JAVA_HOME/bin/java"
77+
fi
78+
if [ ! -x "$JAVACMD" ] ; then
79+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
80+
81+
Please set the JAVA_HOME variable in your environment to match the
82+
location of your Java installation."
83+
fi
84+
else
85+
JAVACMD="java"
86+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
87+
88+
Please set the JAVA_HOME variable in your environment to match the
89+
location of your Java installation."
90+
fi
91+
92+
# Increase the maximum file descriptors if we can.
93+
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
94+
MAX_FD_LIMIT=`ulimit -H -n`
95+
if [ $? -eq 0 ] ; then
96+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
97+
MAX_FD="$MAX_FD_LIMIT"
98+
fi
99+
ulimit -n $MAX_FD
100+
if [ $? -ne 0 ] ; then
101+
warn "Could not set maximum file descriptor limit: $MAX_FD"
102+
fi
103+
else
104+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
105+
fi
106+
fi
107+
108+
# For Darwin, add options to specify how the application appears in the dock
109+
if $darwin; then
110+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
111+
fi
112+
113+
# For Cygwin, switch paths to Windows format before running java
114+
if $cygwin ; then
115+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
116+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
117+
118+
# We build the pattern for arguments to be converted via cygpath
119+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120+
SEP=""
121+
for dir in $ROOTDIRSRAW ; do
122+
ROOTDIRS="$ROOTDIRS$SEP$dir"
123+
SEP="|"
124+
done
125+
OURCYGPATTERN="(^($ROOTDIRS))"
126+
# Add a user-defined pattern to the cygpath arguments
127+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129+
fi
130+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
131+
i=0
132+
for arg in "$@" ; do
133+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
135+
136+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
137+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138+
else
139+
eval `echo args$i`="\"$arg\""
140+
fi
141+
i=$((i+1))
142+
done
143+
case $i in
144+
(0) set -- ;;
145+
(1) set -- "$args0" ;;
146+
(2) set -- "$args0" "$args1" ;;
147+
(3) set -- "$args0" "$args1" "$args2" ;;
148+
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149+
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150+
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151+
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152+
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153+
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154+
esac
155+
fi
156+
157+
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
158+
function splitJvmOpts() {
159+
JVM_OPTS=("$@")
160+
}
161+
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
162+
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
163+
164+
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

0 commit comments

Comments
 (0)