Skip to content

Commit 055078c

Browse files
committed
Consolidate the manifest entry configuration.
1 parent f4f44e5 commit 055078c

File tree

13 files changed

+15
-106
lines changed

13 files changed

+15
-106
lines changed

gradle/convention.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,17 @@ subprojects { project ->
2929
extension 'jar'
3030
}
3131

32+
jar {
33+
manifest {
34+
name = project.name
35+
instruction 'Bundle-Vendor', 'Netflix'
36+
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
37+
if (project.path != ":rxjava-core") {
38+
instruction 'Fragment-Host', 'com.netflix.rxjava.core'
39+
}
40+
}
41+
}
42+
3243
configurations {
3344
create("sources")
3445
create("javadoc")

language-adaptors/rxjava-clojure/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,3 @@ eclipse {
2323
natures "ccw.nature"
2424
}
2525
}
26-
27-
jar {
28-
manifest {
29-
name = 'rxjava-clojure'
30-
instruction 'Bundle-Vendor', 'Netflix'
31-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
32-
instruction 'Fragment-Host', 'com.netflix.rxjava.core'
33-
}
34-
}

language-adaptors/rxjava-groovy/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,3 @@ dependencies {
66
testCompile 'junit:junit-dep:4.10'
77
testCompile 'org.mockito:mockito-core:1.8.5'
88
}
9-
10-
jar {
11-
manifest {
12-
name = 'rxjava-groovy'
13-
instruction 'Bundle-Vendor', 'Netflix'
14-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
15-
instruction 'Fragment-Host', 'com.netflix.rxjava.core'
16-
}
17-
}

language-adaptors/rxjava-jruby/build.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,4 @@ task(rspec, type: JavaExec) {
3434
}
3535
3636
tasks.build.dependsOn << 'rspec'
37-
*/
38-
39-
jar {
40-
manifest {
41-
name = 'rxjava-jruby'
42-
instruction 'Bundle-Vendor', 'Netflix'
43-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
44-
instruction 'Fragment-Host', 'com.netflix.rxjava.core'
45-
}
46-
}
37+
*/

language-adaptors/rxjava-kotlin/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,4 @@ dependencies {
1515
compile 'org.jetbrains.kotlin:kotlin-stdlib:0.6.1673'
1616
testCompile 'junit:junit-dep:4.10'
1717
testCompile 'org.mockito:mockito-core:1.8.5'
18-
}
19-
20-
jar {
21-
manifest {
22-
name = 'rxjava-kotlin'
23-
instruction 'Bundle-Vendor', 'Netflix'
24-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
25-
instruction 'Fragment-Host', 'com.netflix.rxjava.core'
26-
}
2718
}

language-adaptors/rxjava-scala/build.gradle

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,4 @@ task test(overwrite: true, dependsOn: testClasses) << {
3333
ant.scalatest(runpath: sourceSets.test.output.classesDir,
3434
haltonfailure: 'true',
3535
fork: 'false') {reporter(type: 'stdout')}
36-
}
37-
38-
jar {
39-
manifest {
40-
name = 'rxjava-scala'
41-
instruction 'Bundle-Vendor', 'Netflix'
42-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
43-
instruction 'Fragment-Host', 'com.netflix.rxjava.core'
44-
}
45-
}
36+
}

rxjava-contrib/rxjava-android/build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@ dependencies {
1010
testCompile 'org.robolectric:robolectric:2.1.1'
1111
}
1212

13-
14-
jar {
15-
manifest {
16-
name = 'rxjava-android'
17-
instruction 'Bundle-Vendor', 'Netflix'
18-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
19-
}
20-
}
21-
2213
test {
2314
testLogging {
2415
exceptionFormat "full"

rxjava-contrib/rxjava-apache-http/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,3 @@ dependencies {
44
compile 'org.apache.httpcomponents:httpcore-nio:4.3'
55
compile 'org.apache.httpcomponents:httpasyncclient:4.0'
66
}
7-
8-
jar {
9-
manifest {
10-
name = 'rxjava-apache-http'
11-
instruction 'Bundle-Vendor', 'Netflix'
12-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
13-
}
14-
}

rxjava-contrib/rxjava-async-util/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,3 @@ dependencies {
44
testCompile 'junit:junit-dep:4.10'
55
testCompile 'org.mockito:mockito-core:1.8.5'
66
}
7-
8-
jar {
9-
manifest {
10-
name = 'rxjava-async-util'
11-
instruction 'Bundle-Vendor', 'Netflix'
12-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
13-
}
14-
}

rxjava-contrib/rxjava-computation-expressions/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,3 @@ dependencies {
33
testCompile 'junit:junit-dep:4.10'
44
testCompile 'org.mockito:mockito-core:1.8.5'
55
}
6-
7-
jar {
8-
manifest {
9-
name = 'rxjava-computation-expressions'
10-
instruction 'Bundle-Vendor', 'Netflix'
11-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
12-
}
13-
}

rxjava-contrib/rxjava-string/build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,4 @@ dependencies {
33
testCompile project(":rxjava-core").sourceSets.test.output
44
testCompile 'junit:junit-dep:4.10'
55
testCompile 'org.mockito:mockito-core:1.8.5'
6-
}
7-
8-
jar {
9-
manifest {
10-
name = 'rxjava-string'
11-
instruction 'Bundle-Vendor', 'Netflix'
12-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
13-
}
14-
}
6+
}

rxjava-contrib/rxjava-swing/build.gradle

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,4 @@ dependencies {
22
compile project(':rxjava-core')
33
testCompile 'junit:junit-dep:4.10'
44
testCompile 'org.mockito:mockito-core:1.8.5'
5-
}
6-
7-
jar {
8-
manifest {
9-
name = 'rxjava-swing'
10-
instruction 'Bundle-Vendor', 'Netflix'
11-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
12-
}
13-
}
5+
}

rxjava-core/build.gradle

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,3 @@ dependencies {
55
testCompile 'org.mockito:mockito-core:1.8.5'
66
}
77

8-
jar {
9-
manifest {
10-
name = 'rxjava-core'
11-
instruction 'Bundle-Vendor', 'Netflix'
12-
instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava'
13-
}
14-
}
15-

0 commit comments

Comments
 (0)