Skip to content

Updated gradle and dependencies #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
graphcon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated gradle and dependencies #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 12 additions & 20 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apply plugin: 'com.android.application'

android {

compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion 22
buildToolsVersion "22.0.1"

defaultConfig {
applicationId "tv.kodi.android.app"

minSdkVersion 15
targetSdkVersion 21
targetSdkVersion 22

versionCode 1
versionName "0.0.1-SNAPSHOT"
Expand All @@ -36,28 +36,17 @@ android {
}
}



apply plugin: 'android-unit-test'

androidUnitTest {
downloadDependenciesSources true
downloadDependenciesJavadoc true
downloadTestDependenciesSources true
downloadTestDependenciesJavadoc true
}

dependencies {

// app
compile 'com.android.support:support-annotations:21.0.3'
compile 'com.android.support:support-v4:21.0.3'
compile 'com.android.support:appcompat-v7:21.0.3'
compile 'com.android.support:support-annotations:22.2.1'
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:appcompat-v7:22.2.1'
compile('com.google.android.gms:play-services:6.1.+') {
exclude module: 'support-v4'
}
compile 'com.squareup.dagger:dagger:1.0.1'
compile 'com.squareup.dagger:dagger-compiler:1.0.1'
compile 'com.squareup.dagger:dagger:1.2.2'
compile 'com.squareup.dagger:dagger-compiler:1.2.2'
compile 'com.jakewharton:butterknife:4.0.1'
compile 'de.greenrobot:eventbus:2.2.0'
compile 'com.github.chrisbanes.actionbarpulltorefresh:extra-abc:+'
Expand All @@ -79,7 +68,10 @@ dependencies {
androidTestCompile 'org.hamcrest:hamcrest-core:1.1'
androidTestCompile 'org.hamcrest:hamcrest-library:1.1'
androidTestCompile 'org.hamcrest:hamcrest-integration:1.1'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.0'
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2'){
exclude group: 'com.squareup', module: 'javawriter'
exclude group: 'com.android.support', module: 'support-annotations'
}
androidTestCompile 'com.android.support.test:testing-support-lib:0.1'
}

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.github.jcandksolutions.gradle:android-unit-test:2.0.2'
}
}
Expand Down