Skip to content

Commit

Permalink
Merge pull request #3 from tus/remove-appcombat
Browse files Browse the repository at this point in the history
Remove appcompat-v7 dependency
  • Loading branch information
Acconut committed Oct 27, 2015
2 parents 0622859 + 2480d12 commit 7f1b4ba
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ language: android
android:
components:
# SDK version
- android-21
- android-22
# Build tools version
- build-tools-21.1.1
- build-tools-22.0.1
script:
- ./gradlew test
deploy:
Expand Down
2 changes: 1 addition & 1 deletion example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {

defaultConfig {
applicationId "io.tus.android.example"
minSdkVersion 15
minSdkVersion 7
targetSdkVersion 21
versionCode 1
versionName "1.0"
Expand Down
7 changes: 3 additions & 4 deletions tus-android-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
apply plugin: 'maven'

android {
compileSdkVersion 21
compileSdkVersion 22
buildToolsVersion "21.1.2"

defaultConfig {
minSdkVersion 7
targetSdkVersion 21
minSdkVersion 4
targetSdkVersion 22
versionCode 1
versionName "1.0"
}
Expand All @@ -21,7 +21,6 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'io.tus.java.client:tus-java-client:0.1.1'
testCompile 'org.robolectric:robolectric:2.4'
testCompile 'junit:junit:4.12'
Expand Down

0 comments on commit 7f1b4ba

Please sign in to comment.