Skip to content

Commit ba1c7af

Browse files
committed
Merge pull request #7 from zmy/master
Minor improvements.
2 parents 1737cee + f9670e9 commit ba1c7af

File tree

3 files changed

+35
-8
lines changed

3 files changed

+35
-8
lines changed

.gitignore

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
.gradle
1+
# Generated files
2+
bin/
3+
gen/
4+
5+
# Gradle files
6+
.gradle/
27
build/
8+
/*/build/
39

410
# Ignore Gradle GUI config
511
gradle-app.setting
@@ -9,3 +15,25 @@ gradle-app.setting
915

1016
# Cache of project
1117
.gradletasknamecache
18+
19+
# Local configuration file (sdk path, etc)
20+
local.properties
21+
22+
# Intellij project files
23+
*.iml
24+
*.ipr
25+
*.iws
26+
.idea/
27+
28+
# Android Studio files
29+
.gradle/
30+
build
31+
out
32+
*.trace
33+
34+
# Tmp files of editors
35+
*.swp
36+
37+
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
38+
!gradle-wrapper.jar
39+

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ android:
33
components:
44
- platform-tools
55
- tools
6-
- build-tools-23.0.1
6+
- build-tools-23.0.2
77
- android-23
88
- extra
99
before_cache:

build.gradle

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ apply plugin: 'com.android.library'
2121

2222
android {
2323
compileSdkVersion 23
24-
buildToolsVersion "23.0.1"
24+
buildToolsVersion "23.0.2"
2525

2626
defaultConfig {
2727
minSdkVersion 9
@@ -39,13 +39,12 @@ android {
3939

4040
dependencies {
4141
compile fileTree(dir: 'libs', include: ['*.jar'])
42-
testCompile 'junit:junit:4.12'
4342
compile 'com.github.mulab:android-log:1.0.1'
4443
compile 'io.reactivex:rxandroid:1.0.1'
45-
// Because RxAndroid releases are few and far between, it is recommended you also
46-
// explicitly depend on RxJava's latest version for bug fixes and new features.
47-
compile 'io.reactivex:rxjava:1.0.14'
48-
compile 'io.realm:realm-android:0.82.2'
44+
// Because RxAndroid releases are few and far between, it is recommended you also
45+
// explicitly depend on RxJava's latest version for bug fixes and new features.
46+
compile 'io.reactivex:rxjava:1.0.16'
47+
compile 'io.realm:realm-android:0.85.1'
4948
testCompile 'junit:junit:4.12'
5049
androidTestCompile 'com.android.support.test:runner:0.3'
5150
androidTestCompile 'com.android.support.test:rules:0.3'

0 commit comments

Comments
 (0)