Skip to content

Commit e99a62b

Browse files
author
Adrian Cole
committed
Merge pull request OpenFeign#48 from Netflix/dagger-ide
Dagger annotation processing via gradle eclipse and idea plugins
2 parents ec9e169 + 29839c9 commit e99a62b

67 files changed

Lines changed: 187 additions & 84 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ atlassian-ide-plugin.xml
6363
.project
6464
.settings
6565
.metadata
66+
.factorypath
67+
.generated
6668

6769
# NetBeans specific files/directories
6870
.nbattrs

‎build.gradle‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ apply from: file('gradle/maven.gradle')
2222
apply from: file('gradle/check.gradle')
2323
apply from: file('gradle/license.gradle')
2424
apply from: file('gradle/release.gradle')
25+
apply plugin: 'idea'
2526

2627
subprojects {
28+
apply from: rootProject.file('dagger.gradle')
2729
group = "com.netflix.${githubProjectName}" // TEMPLATE: Set to organization of project
2830
}
2931

@@ -35,8 +37,6 @@ project(':feign-core') {
3537
}
3638

3739
dependencies {
38-
compile 'com.squareup.dagger:dagger:1.1.0'
39-
provided 'com.squareup.dagger:dagger-compiler:1.1.0'
4040
testCompile 'com.google.guava:guava:14.0.1'
4141
testCompile 'com.google.code.gson:gson:2.2.4'
4242
testCompile 'com.fasterxml.jackson.core:jackson-databind:2.2.2'
@@ -55,7 +55,6 @@ project(':feign-gson') {
5555
dependencies {
5656
compile project(':feign-core')
5757
compile 'com.google.code.gson:gson:2.2.4'
58-
provided 'com.squareup.dagger:dagger-compiler:1.1.0'
5958
testCompile 'org.testng:testng:6.8.5'
6059
}
6160
}
@@ -70,9 +69,6 @@ project(':feign-jaxrs') {
7069
dependencies {
7170
compile project(':feign-core')
7271
compile 'javax.ws.rs:jsr311-api:1.1.1'
73-
provided 'com.squareup.dagger:dagger-compiler:1.1.0'
74-
// for example classes
75-
testCompile project(':feign-core').sourceSets.test.output
7672
testCompile project(':feign-gson')
7773
testCompile 'com.google.guava:guava:14.0.1'
7874
testCompile 'org.testng:testng:6.8.5'
@@ -89,7 +85,6 @@ project(':feign-ribbon') {
8985
dependencies {
9086
compile project(':feign-core')
9187
compile 'com.netflix.ribbon:ribbon-core:0.2.0'
92-
provided 'com.squareup.dagger:dagger-compiler:1.1.0'
9388
testCompile 'org.testng:testng:6.8.5'
9489
testCompile 'com.google.mockwebserver:mockwebserver:20130706'
9590
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)