From bf553b9851127a9b8da19a069b612e3c3d18cffd Mon Sep 17 00:00:00 2001 From: Ben Christensen Date: Mon, 11 Mar 2013 20:32:34 -0700 Subject: [PATCH] Add OSGi manifest headers https://github.com/Netflix/RxJava/issues/154 I can't confirm that these work but submitting based on discussion on issue #154. --- language-adaptors/rxjava-clojure/build.gradle | 10 +++++++++- language-adaptors/rxjava-groovy/build.gradle | 10 ++++++++++ language-adaptors/rxjava-jruby/build.gradle | 10 ++++++++++ language-adaptors/rxjava-scala/build.gradle | 10 ++++++++++ rxjava-core/build.gradle | 10 ++++++++++ 5 files changed, 49 insertions(+), 1 deletion(-) diff --git a/language-adaptors/rxjava-clojure/build.gradle b/language-adaptors/rxjava-clojure/build.gradle index fdaa8f4857b..fbf1adde2eb 100644 --- a/language-adaptors/rxjava-clojure/build.gradle +++ b/language-adaptors/rxjava-clojure/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'java' apply plugin: 'clojure' apply plugin: 'eclipse' apply plugin: 'idea' +apply plugin: 'osgi' dependencies { compile project(':rxjava-core') @@ -75,4 +76,11 @@ configurations { // include 'examples' in build task build.dependsOn examplesClasses - +jar { + manifest { + name = 'rxjava-clojure' + instruction 'Bundle-Vendor', 'Netflix' + instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava' + instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' + } +} \ No newline at end of file diff --git a/language-adaptors/rxjava-groovy/build.gradle b/language-adaptors/rxjava-groovy/build.gradle index 3647f6af11d..a2a6752b300 100644 --- a/language-adaptors/rxjava-groovy/build.gradle +++ b/language-adaptors/rxjava-groovy/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'java' apply plugin: 'groovy' apply plugin: 'eclipse' apply plugin: 'idea' +apply plugin: 'osgi' dependencies { compile project(':rxjava-core') @@ -39,4 +40,13 @@ idea { // include 'provided' dependencies on the classpath scopes.PROVIDED.plus += configurations.provided } +} + +jar { + manifest { + name = 'rxjava-groovy' + instruction 'Bundle-Vendor', 'Netflix' + instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava' + instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' + } } \ No newline at end of file diff --git a/language-adaptors/rxjava-jruby/build.gradle b/language-adaptors/rxjava-jruby/build.gradle index c86af4212a9..ef85fc6328e 100644 --- a/language-adaptors/rxjava-jruby/build.gradle +++ b/language-adaptors/rxjava-jruby/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' +apply plugin: 'osgi' dependencies { compile project(':rxjava-core') @@ -24,4 +25,13 @@ idea { // include 'provided' dependencies on the classpath scopes.PROVIDED.plus += configurations.provided } +} + +jar { + manifest { + name = 'rxjava-jruby' + instruction 'Bundle-Vendor', 'Netflix' + instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava' + instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' + } } \ No newline at end of file diff --git a/language-adaptors/rxjava-scala/build.gradle b/language-adaptors/rxjava-scala/build.gradle index edff7a24b1a..6813752f7f5 100644 --- a/language-adaptors/rxjava-scala/build.gradle +++ b/language-adaptors/rxjava-scala/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'scala' apply plugin: 'eclipse' apply plugin: 'idea' +apply plugin: 'osgi' tasks.withType(ScalaCompile) { scalaCompileOptions.fork = true @@ -50,4 +51,13 @@ idea { // include 'provided' dependencies on the classpath scopes.PROVIDED.plus += configurations.provided } +} + +jar { + manifest { + name = 'rxjava-scala' + instruction 'Bundle-Vendor', 'Netflix' + instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava' + instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' + } } \ No newline at end of file diff --git a/rxjava-core/build.gradle b/rxjava-core/build.gradle index f2cc392bead..45f231be750 100644 --- a/rxjava-core/build.gradle +++ b/rxjava-core/build.gradle @@ -1,6 +1,7 @@ apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'idea' +apply plugin: 'osgi' sourceCompatibility = JavaVersion.VERSION_1_6 targetCompatibility = JavaVersion.VERSION_1_6 @@ -42,3 +43,12 @@ javadoc { options.addStringOption('top').value = '

RxJava

' } +jar { + manifest { + name = 'rxjava-core' + instruction 'Bundle-Vendor', 'Netflix' + instruction 'Bundle-DocURL', 'https://github.com/Netflix/RxJava' + instruction 'Import-Package', '!org.junit,!junit.framework,!org.mockito.*,*' + } +} +