Skip to content

Commit c6a2132

Browse files
authored
Merge pull request #116 from DmitriyZaitsev/chore/dependencies
Make domain and data modules dependent on javax.inject instead of dagger 2
2 parents 51e57bd + 657d523 commit c6a2132

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

buildsystem/dependencies.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ ext {
1818
rxJavaVersion = '1.0.14'
1919
rxAndroidVersion = '1.0.1'
2020
javaxAnnotationVersion = '1.0'
21+
javaxInjectVersion = '1'
2122
gsonVersion = '2.3'
2223
okHttpVersion = '2.5.0'
2324
androidAnnotationsVersion = '21.0.3'
@@ -56,6 +57,7 @@ ext {
5657
daggerCompiler: "com.google.dagger:dagger-compiler:${daggerVersion}",
5758
dagger: "com.google.dagger:dagger:${daggerVersion}",
5859
javaxAnnotation: "javax.annotation:jsr250-api:${javaxAnnotationVersion}",
60+
javaxInject: "javax.inject:javax.inject:${javaxInjectVersion}",
5961
rxJava: "io.reactivex:rxjava:${rxJavaVersion}",
6062
]
6163

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

data/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,8 @@ dependencies {
5353
def testDependencies = rootProject.ext.dataTestDependencies
5454

5555
compile project(':domain')
56-
apt dataDependencies.daggerCompiler
5756
provided dataDependencies.javaxAnnotation
58-
compile dataDependencies.dagger
57+
compile dataDependencies.javaxInject
5958
compile dataDependencies.okHttp
6059
compile dataDependencies.gson
6160
compile dataDependencies.rxJava

domain/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ dependencies {
1919
def domainDependencies = rootProject.ext.domainDependencies
2020
def domainTestDependencies = rootProject.ext.domainTestDependencies
2121

22-
provided domainDependencies.daggerCompiler
2322
provided domainDependencies.javaxAnnotation
2423

25-
compile domainDependencies.dagger
24+
compile domainDependencies.javaxInject
2625
compile domainDependencies.rxJava
2726

2827
testCompile domainTestDependencies.junit

0 commit comments

Comments
 (0)