Merge pull request #34 from ical4j/develop

Prepare release
ical4j · Nov 3, 2023 · 69bab13 · 69bab13
2 parents d55ded8 + 8755070
commit 69bab13
Show file tree

Hide file tree

Showing 26 changed files with 823 additions and 167 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,4 @@
-CHANGELOG_START_TAG=ical4j-extensions-1.0.4
+CHANGELOG_START_TAG=ical4j-extensions-2.0.0-beta2
 CHANGELOG_END_TAG=HEAD
 
-GRADLE_VERSION=7.4.2
+GRADLE_VERSION=7.6
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-java@v1
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: temurin
           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
+
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
+      - name: Execute Gradle build
+        run: ./gradlew check
diff --git a/.github/workflows/publish-snapshots.yml b/.github/workflows/publish-snapshots.yml
@@ -34,19 +34,19 @@ jobs:
     needs: gradle
     if: ${{ needs.gradle.result == 'success' }}
     runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: 11
 
-      - uses: eskatos/gradle-command-action@v1
-        with:
-          arguments: build -x test publish
+      - 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 }}

diff --git a/Makefile b/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 changelog currentVersion markNextVersion listApiChanges approveApiChanges \
+.PHONY: all gradlew clean check build 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
 

diff --git a/build.gradle b/build.gradle
@@ -16,12 +16,18 @@ targetCompatibility = 1.8
 
 repositories {
     mavenCentral()
+    mavenLocal()
     // sonatype snapshots
     maven {
         url 'https://oss.sonatype.org/content/repositories/snapshots/'
     }
 }
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
 dependencies {
     api "org.mnode.ical4j:ical4j:$ical4jVersion",
             'com.sun.mail:jakarta.mail:2.0.1'
@@ -62,21 +68,6 @@ javadoc {
     }
 }
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier.set('javadoc')
-    from 'build/docs/javadoc'
-}
-
-task sourcesJar(type: Jar) {
-    from sourceSets.main.allSource
-    archiveClassifier.set('sources')
-}
-
-artifacts {
-    archives javadocJar
-    archives sourcesJar
-}
-
 scmVersion {
     tag {
         prefix = 'ical4j-extensions-'
@@ -89,6 +80,21 @@ group = 'org.mnode.ical4j'
 description = 'Support for additional non-standard iCalendar objects'
 version = scmVersion.version
 
+jar {
+    manifest {
+        attributes(
+                'Implementation-Title': 'iCal4j Extensions',
+                'Implementation-Version': version,
+                'Implementation-Vendor': 'Ben Fortuna'
+        )
+    }
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
 revapi {
     oldVersion = revApiOldVersion
 }
@@ -101,8 +107,6 @@ publishing {
     publications {
         ical4j_extensions(MavenPublication) {
             from components.java
-            artifact javadocJar
-            artifact sourcesJar
             pom.withXml {
                 asNode().appendNode('name', project.name)
                 asNode().appendNode('description', project.description)

diff --git a/gradle.properties b/gradle.properties
@@ -1,7 +1,8 @@
-ical4jVersion=4.0.0-beta2
+ical4jVersion=4.0.0-rc1
+
 groovyVersion=3.0.10
-slf4jVersion=1.7.36
-log4jVersion=2.17.2
+slf4jVersion=2.0.7
+log4jVersion=2.20.0
 bndVersion=6.2.0
 jacoco_htmlReport=true
 revApiOldVersion=1.0.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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