Skip to content

Commit

Permalink
Update minumum DITA-OT to 4.1
Browse files Browse the repository at this point in the history
  • Loading branch information
jelovirt committed Nov 10, 2024
1 parent 4263c03 commit 0b1ecd9
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 27 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/dist.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
dist:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 8
java-version: 17
cache: gradle
- name: Build with Gradle
run: ./gradlew dist
Expand All @@ -40,7 +40,7 @@ jobs:
echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_ENV
echo "PLUGIN_NAME=com.elovirta.pdf" >> $GITHUB_ENV
- name: Check out registry
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: dita-ot/registry
path: registry
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
node:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18.x
- run: npm install
Expand All @@ -21,12 +21,12 @@ jobs:
java:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 1.8
uses: actions/setup-java@v3
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 8
java-version: 17
cache: gradle
- name: Build with Gradle
run: ./gradlew dist
4 changes: 2 additions & 2 deletions .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=8.0.282.hs-adpt
gradle=6.8.3
java=17.0.7-tem
gradle=8.7
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ repositories {
mavenCentral()
}

sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 17
targetCompatibility = 17

dependencies {
implementation group: 'org.apache.ant', name: 'ant', version:'1.10.12'
Expand All @@ -26,7 +26,7 @@ dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.13.2.2'
implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.13.0'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.32'
implementation group: "org.dita-ot", name: "dost", version: "[3.4,4.0)"
implementation group: "org.dita-ot", name: "dost", version: "[4.1,)"
implementation group: 'net.sf.saxon', name: 'Saxon-HE', version: '10.6'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.2'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 0 additions & 10 deletions src/test/resources/src/authored.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
{
"$schema": "../../../main/resources/schema.json",

"brand": {
"color": {
"primary": "pink"
}
},

"page": {
"size": "A4",
"top": "20mm",
Expand Down Expand Up @@ -40,10 +34,6 @@
"background-color": "pink",
"border-after": "solid 1pt gray"
},
"example": {
"title": { "background-color": "pink" }
},
"note": {},
"table": {
"header": { "color": "green" }
}
Expand Down

0 comments on commit 0b1ecd9

Please sign in to comment.