Skip to content
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

Make domain and data modules dependent on javax.inject instead of dagger 2 #116

Merged
merged 1 commit into from
Jul 3, 2016
Merged

Make domain and data modules dependent on javax.inject instead of dagger 2 #116

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
3 changes: 3 additions & 0 deletions buildsystem/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ext {
rxJavaVersion = '1.0.14'
rxAndroidVersion = '1.0.1'
javaxAnnotationVersion = '1.0'
javaxInjectVersion = '1'
gsonVersion = '2.3'
okHttpVersion = '2.5.0'
androidAnnotationsVersion = '21.0.3'
Expand Down Expand Up @@ -56,6 +57,7 @@ ext {
daggerCompiler: "com.google.dagger:dagger-compiler:${daggerVersion}",
dagger: "com.google.dagger:dagger:${daggerVersion}",
javaxAnnotation: "javax.annotation:jsr250-api:${javaxAnnotationVersion}",
javaxInject: "javax.inject:javax.inject:${javaxInjectVersion}",
rxJava: "io.reactivex:rxjava:${rxJavaVersion}",
]

Expand All @@ -72,6 +74,7 @@ ext {
rxJava: "io.reactivex:rxjava:${rxJavaVersion}",
rxAndroid: "io.reactivex:rxandroid:${rxAndroidVersion}",
javaxAnnotation: "javax.annotation:jsr250-api:${javaxAnnotationVersion}",
javaxInject: "javax.inject:javax.inject:${javaxInjectVersion}",
androidAnnotations: "com.android.support:support-annotations:${androidAnnotationsVersion}"
]

Expand Down
3 changes: 1 addition & 2 deletions data/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ dependencies {
def testDependencies = rootProject.ext.dataTestDependencies

compile project(':domain')
apt dataDependencies.daggerCompiler
provided dataDependencies.javaxAnnotation
compile dataDependencies.dagger
compile dataDependencies.javaxInject
compile dataDependencies.okHttp
compile dataDependencies.gson
compile dataDependencies.rxJava
Expand Down
3 changes: 1 addition & 2 deletions domain/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@ dependencies {
def domainDependencies = rootProject.ext.domainDependencies
def domainTestDependencies = rootProject.ext.domainTestDependencies

provided domainDependencies.daggerCompiler
provided domainDependencies.javaxAnnotation

compile domainDependencies.dagger
compile domainDependencies.javaxInject
compile domainDependencies.rxJava

testCompile domainTestDependencies.junit
Expand Down