Skip to content

Commit a45e9ec

Browse files
committed
Revert back to Java 8 version
1 parent 094a74c commit a45e9ec

29 files changed

+1381
-3603
lines changed

.github/workflows/build-main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
1818
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
1919
steps:
20-
- name: Check out code
21-
uses: actions/checkout@v4
22-
- name: Setup java
20+
- name: Setup JDK 8
2321
uses: actions/setup-java@v4
2422
with:
25-
distribution: 'temurin'
26-
java-version: '21'
23+
java-version: '8'
24+
distribution: 'adopt'
25+
- name: Check out code
26+
uses: actions/checkout@v4
2727
- name: Build and Test
2828
run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
2929
- name: Verify Javadoc
3030
run: ./gradlew javadoc
31-
- name: Publish Snapshot
31+
- name: Verify and Publish Snapshot
3232
run: ./gradlew -i publishToSonatype

.github/workflows/build-pr.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
BUILD_EVENT: ${{ github.event_name }}
1212
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
1313
steps:
14-
- name: Check out code
15-
uses: actions/checkout@v4
16-
- name: Setup java
14+
- name: Setup JDK 8
1715
uses: actions/setup-java@v4
1816
with:
19-
distribution: 'temurin'
20-
java-version: '21'
17+
java-version: '8'
18+
distribution: 'adopt'
19+
- name: Check out code
20+
uses: actions/checkout@v4
2121
- name: Build and Test
2222
run: chmod +x gradlew && ./gradlew clean test jacocoTestReport coveralls
2323
- name: Verify Javadoc

.github/workflows/build-release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ jobs:
1717
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
1818
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
1919
steps:
20-
- name: Check out code
21-
uses: actions/checkout@v4
22-
- name: Setup java
20+
- name: Setup JDK 8
2321
uses: actions/setup-java@v4
2422
with:
25-
distribution: 'temurin'
26-
java-version: '21'
23+
java-version: '8'
24+
distribution: 'adopt'
25+
- name: Check out code
26+
uses: actions/checkout@v4
2727
- name: Build and Test
2828
run: chmod +x gradlew && ./gradlew clean test
2929
- name: Verify Javadoc
3030
run: ./gradlew javadoc
3131
- name: Verify, Sign and Publish Release
32-
run: ./gradlew -i signMavenJavaPublication publishToSonatype closeAndReleaseSonatypeStagingRepository
32+
run: ./gradlew -i signArchives signMavenJavaPublication publishToSonatype closeAndReleaseSonatypeStagingRepository

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This library is a JSON Parser built specifically for JNATS to avoid a 3rd party
66

77
It has been extracted and repackaged from the JNATS library since it is also used by the [jwt.java](https://github.com/nats-io/jwt.java) library.
88

9-
**Current Release**: 2.0.1   **Current Snapshot**: 2.0.2-SNAPSHOT
9+
**Current Release**: 2.0.0   **Current Snapshot**: 2.0.1-SNAPSHOT
1010

1111
[![License Apache 2](https://img.shields.io/badge/License-Apache2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
1212
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.nats/jnats-json/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.nats/jnats-json)

build.gradle

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ plugins {
77
id 'jacoco'
88
id 'com.github.kt3k.coveralls' version '2.12.2'
99
id "org.gradle.test-retry" version "1.1.9"
10-
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
10+
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
1111
id 'signing'
1212
}
1313

14-
def jarVersion = "3.0.0"
14+
def jarVersion = "2.22.0"
1515
group = 'io.nats'
1616

1717
def isMerge = System.getenv("BUILD_EVENT") == "push"
@@ -21,20 +21,16 @@ def isRelease = System.getenv("BUILD_EVENT") == "release"
2121
version = isRelease ? jarVersion : jarVersion + "-SNAPSHOT"
2222

2323
java {
24-
toolchain {
25-
languageVersion = JavaLanguageVersion.of(21)
26-
}
24+
sourceCompatibility = JavaVersion.VERSION_1_8
25+
targetCompatibility = JavaVersion.VERSION_1_8
2726
}
2827

2928
repositories {
3029
mavenCentral()
3130
maven { url "https://oss.sonatype.org/content/repositories/releases/" }
32-
maven { url "https://repo1.maven.org/maven2/" }
3331
}
3432

3533
dependencies {
36-
implementation 'org.jetbrains:annotations:26.0.2'
37-
implementation 'commons-codec:commons-codec:1.18.0'
3834

3935
testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1'
4036
testImplementation 'nl.jqno.equalsverifier:equalsverifier:4.0'
@@ -50,7 +46,6 @@ test {
5046
}
5147

5248
javadoc {
53-
options.addBooleanOption('html5', true)
5449
options.overview = 'src/main/javadoc/overview.html' // relative to source root
5550
source = sourceSets.main.allJava
5651
title = "NATS.IO JNats JSON"
@@ -72,12 +67,12 @@ javadoc {
7267
}
7368
}
7469

75-
tasks.register('javadocJar', Jar) {
70+
task javadocJar(type: Jar) {
7671
archiveClassifier.set('javadoc')
7772
from javadoc
7873
}
7974

80-
tasks.register('sourcesJar', Jar) {
75+
task sourcesJar(type: Jar) {
8176
archiveClassifier.set('sources')
8277
from sourceSets.main.allSource
8378
}
@@ -88,8 +83,14 @@ jacoco {
8883

8984
jacocoTestReport {
9085
reports {
91-
xml.required = true // coveralls plugin depends on xml format report
92-
html.required = true
86+
xml.enabled = true // coveralls plugin depends on xml format report
87+
html.enabled = true
88+
}
89+
afterEvaluate { // only report on main library not examples
90+
classDirectories.setFrom(files(classDirectories.files.collect {
91+
fileTree(dir: it,
92+
exclude: ['**/examples**'])
93+
}))
9394
}
9495
}
9596

@@ -151,6 +152,7 @@ if (isRelease) {
151152
def signingKey = System.getenv('SIGNING_KEY')
152153
def signingPassword = System.getenv('SIGNING_PASSWORD')
153154
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
155+
sign configurations.archives
154156
sign publishing.publications.mavenJava
155157
}
156158
}

env.bat

Lines changed: 0 additions & 2 deletions
This file was deleted.

gradle/wrapper/gradle-wrapper.jar

14.6 KB
Binary file not shown.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
4-
networkTimeout=10000
5-
validateDistributionUrl=true
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
64
zipStoreBase=GRADLE_USER_HOME
75
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)