Merge pull request #17 from ical4j/develop

Prepare release

.env

@@ -1,4 +1,4 @@
 CHANGELOG_START_TAG=ical4j-serializer-0.1.6
 CHANGELOG_END_TAG=HEAD
 
-GRADLE_VERSION=7.4.2
+GRADLE_VERSION=7.6

.github/workflows/build.yml

@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 11
-#    - name: Grant execute permission for gradlew
-#      run: chmod +x gradlew
-    - name: Build with Gradle
-#      run: ./gradlew build
-      uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: build
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Execute Gradle build
+        run: ./gradlew check --console=plain --warning-mode all

.github/workflows/publish-snapshots.yml

@@ -11,15 +11,19 @@ jobs:
   gradle:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - uses: eskatos/gradle-command-action@v1
-      with:
-        arguments: build -x test publish
-      env:
-        GPR_USERNAME: benfortuna
-        GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
-        MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Execute Gradle build
+        run: ./gradlew build -x test publish
+        env:
+          GPR_USERNAME: benfortuna
+          GPR_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}

Makefile

@@ -4,17 +4,20 @@ include .env
 NEXT_VERSION=$(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 CHANGE_JUSTIFICATION=$(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 
-.PHONY: all gradlew clean build zoneinfo changelog currentVersion markNextVersion listApiChanges approveApiChanges \
+.PHONY: all gradlew clean check build zoneinfo changelog currentVersion markNextVersion listApiChanges approveApiChanges \
 	verify release publish
 
-all: test
+all: check
 
 gradlew:
 	./gradlew wrapper --gradle-version=$(GRADLE_VERSION) --distribution-type=bin
 
 clean:
 	./gradlew clean
 
+check:
+	./gradlew check
+
 test:
 	./gradlew test
 
@@ -37,6 +40,9 @@ listApiChanges:
 approveApiChanges:
 	./gradlew :revapiAcceptAllBreaks --justification $(CHANGE_JUSTIFICATION)
 
+install:
+	./gradlew publishToMavenLocal
+
 verify:
 	./gradlew verify
 

README.md

@@ -12,7 +12,7 @@
 [CalDAV]: https://tools.ietf.org/html/rfc4791
 [JSON Feed]: https://www.jsonfeed.org/version/1.1/
 
-The purpose of this library is to provide custom marshalling between iCal4j objects and other formats.
+The purpose of this library is to provide custom marshalling between iCal4j objects and JSON/XML-based formats.
 
 ## Overview
 
@@ -32,11 +32,16 @@ when translating between iCalendar objects and this JSON format.
 This format is a good choice when unambiguous interoperability is required, as in theory if an agent supports
 the iCalendar specification then it should be reasonably trivial to have equivalent support for this format.
 
+### jCard - The JSON format for vCard
+
+As iCal4j includes a vCard object representation, it also makes sense to support JSON conversion of this
+object model. [jCard] provides a specification for converting JSON to/from vCard data.
+
 ### xCal - The XML Format for iCalendar
 
 TBD.
 
-### JSCalendar - A JSON representation of calendar data 
+### JMAP - A JSON representation of calendar/contact data 
 
 [JSCalendar] is a relatively new format
 (currently a draft specification), and aims to simplify the data representation of iCalendar data by focusing
@@ -47,11 +52,6 @@ availability.
 This format is good for calendar agents that do not yet have support for iCalendar, but would like to support
 interoperability with other calendar agents. As this is still a draft standard it is subject to change.
 
-### jCard - The JSON format for vCard
-
-As iCal4j includes a vCard object representation, it also makes sense to support JSON conversion of this
-object model. [jCard] provides a specification for converting JSON to/from vCard data.
-
 ### JSCard - A JSON representation for contact data
 
 [JSCard] provides a specification for converting JSON to/from vCard data.

build.gradle

@@ -10,6 +10,7 @@ plugins {
 
 repositories {
     mavenCentral()
+    mavenLocal()
     // sonatype snapshots
     maven {
         url 'https://oss.sonatype.org/content/repositories/snapshots/'
@@ -30,6 +31,10 @@ dependencies {
             "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
             "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion"
 
+    implementation "org.ical4j:ical4j-template:$ical4jTemplateVersion"
+
+    implementation 'com.j2html:j2html:1.6.0'
+
     compileOnly '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',

gradle.properties

@@ -1,8 +1,10 @@
-ical4jVersion = 4.0.0-beta7
-ical4jVCardVersion = 2.0.0-alpha5
+ical4jVersion = 4.0.0-rc3
+ical4jVCardVersion = 2.0.0-beta2
+ical4jTemplateVersion = 0.2.0
+
 jacksonVersion = 2.14.2
 groovyVersion = 3.0.11
-slf4jVersion = 1.7.36
-log4jVersion = 2.17.2
+slf4jVersion = 2.0.7
+log4jVersion = 2.20.0
 
-spockVersion = 2.0-groovy-3.0
+spockVersion = 2.4-M1-groovy-3.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists