Skip to content

Commit

Permalink
Added Java module support
Browse files Browse the repository at this point in the history
  • Loading branch information
benfortuna committed Feb 24, 2024
1 parent 20b9fdc commit b4fa014
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 7 deletions.
1 change: 0 additions & 1 deletion bnd.bnd
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
Export-Package: org.mnode.ical4j.serializer
Automatic-Module-Name: org.mnode.ical4j.serializer
Bundle-License: https://raw.githubusercontent.com/ical4j/ical4j/master/LICENSE.txt
10 changes: 7 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
id 'maven-publish'
id 'signing'
id 'pl.allegro.tech.build.axion-release' version '1.13.6'
id 'org.javamodularity.moduleplugin' version '1.8.13'
}

repositories {
Expand All @@ -17,8 +18,8 @@ repositories {
}
}

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11

java {
withJavadocJar()
Expand All @@ -35,7 +36,7 @@ dependencies {

implementation 'com.j2html:j2html:1.6.0'

compileOnly 'org.osgi:osgi.core:8.0.0',
annotationProcessor 'org.osgi:osgi.core:8.0.0',
'org.osgi:org.osgi.service.component.annotations:1.5.0',
'org.osgi:org.osgi.service.metatype.annotations:1.4.1',
'org.osgi:org.osgi.annotation:6.0.0'
Expand All @@ -53,6 +54,9 @@ dependencies {
}

test {
moduleOptions {
runOnClasspath = true
}
useJUnitPlatform()
}

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ical4jVersion = 4.0.0-rc3
ical4jVCardVersion = 2.0.0-beta2
ical4jTemplateVersion = 0.2.0
ical4jVersion = 4.0.0-rc4
ical4jVCardVersion = 2.0.0-beta3
ical4jTemplateVersion = 0.2.1

jacksonVersion = 2.14.2
groovyVersion = 3.0.11
Expand Down
19 changes: 19 additions & 0 deletions src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module ical4j.serializer {
requires java.base;
requires ical4j.core;
requires ical4j.vcard;
requires ical4j.extensions;
requires ical4j.template;

requires com.fasterxml.jackson.databind;
requires com.fasterxml.jackson.dataformat.xml;
requires org.apache.commons.codec;

exports org.mnode.ical4j.serializer;
exports org.mnode.ical4j.serializer.jotn;
exports org.mnode.ical4j.serializer.jotn.component;
exports org.mnode.ical4j.serializer.jotn.property;
exports org.mnode.ical4j.serializer.atom;
exports org.mnode.ical4j.serializer.jmap;
exports org.mnode.ical4j.serializer.jsonld;
}

0 comments on commit b4fa014

Please sign in to comment.