Navigation Menu

Skip to content

Commit

Permalink
Replace unsupported osgi plugin with bnd plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
benfortuna committed Jul 29, 2019
1 parent 80147ee commit c416c9b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 34 deletions.
1 change: 1 addition & 0 deletions bnd.bnd
@@ -0,0 +1 @@
Import-Package: groovy.*;resolution:=optional, org.codehaus.groovy*;resolution:=optional, *
45 changes: 11 additions & 34 deletions build.gradle
@@ -1,9 +1,12 @@
import aQute.bnd.gradle.Bundle

buildscript {
repositories {
mavenCentral()
}
dependencies {
classpath 'org.hidetake:gradle-ssh-plugin:1.1.3'
classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.2.0'
}
}

Expand All @@ -17,7 +20,7 @@ plugins {
apply plugin: 'java'
apply plugin: 'java-library'
apply plugin: 'groovy'
apply plugin: 'osgi'
apply plugin: 'biz.aQute.bnd.builder'
apply plugin: 'maven'
apply plugin: 'maven-publish'
apply plugin: 'jacoco'
Expand All @@ -39,33 +42,6 @@ ext {
groovyVersion = '2.5.4'
}

/*
githubPages {
// repoUri = 'https://github.com/ical4j/ical4j.github.io.git'
repoUri = 'git@github.com:ical4j/ical4j.github.io.git'
pages {
from javadoc.outputs.files
}
}
*/
/*
github {
/* Wiki repo will be calculated from this. *
repo = 'git@github.com:ical4j/ical4j.git'
wiki {
/*
This is the same as used in Gradle Copy Task.
Please refer to Gradle documentation for information.
*
from javadoc.outputs.files {
into 'ical4j/javadoc'
}
into { "javadoc/$project.release.version" }
}
}
*/

repositories {
mavenCentral()
}
Expand Down Expand Up @@ -104,6 +80,11 @@ javadoc {
}
}

task bundle(type: Bundle) {
from sourceSets.main.output
bndfile = 'bnd.bnd'
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from 'build/docs/javadoc'
Expand All @@ -114,14 +95,10 @@ task sourcesJar(type: Jar) {
classifier = 'sources'
}

jar {
manifest {
instruction 'Import-Package', 'groovy.*;resolution:=optional, org.codehaus.groovy*;resolution:=optional, *'
}
}
jar.enabled = false

artifacts {
archives jar
archives bundle
archives javadocJar
archives sourcesJar
}
Expand Down

0 comments on commit c416c9b

Please sign in to comment.