Skip to content

Commit

Permalink
Upgraded to java 17
Browse files Browse the repository at this point in the history
  • Loading branch information
jiakuan committed Dec 5, 2024
1 parent 1bee271 commit d1ce9c7
Show file tree
Hide file tree
Showing 8 changed files with 211 additions and 138 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: 11
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
run: ./gradlew clean build --warning-mode all
2 changes: 1 addition & 1 deletion .sdkmanrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=11.0.18-amzn
java=17.0.3-oracle
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ clean:
pull:
git pull
git submodule update --init --recursive
git submodule foreach git checkout master
git submodule foreach git checkout main
git submodule foreach git pull

.PHONY: build
build:
./gradlew build
./gradlew build --warning-mode all

build-fast:
./gradlew build -Pcheck=false -x test
./gradlew build -Pcheck=false -x test --warning-mode all

release:
./gradlew release -Prelease.useAutomaticVersion=true
./gradlew release --warning-mode all

publish: build
rm -rf $$HOME/.m2/repository/io/documentnode/epub4j-core
./gradlew publishToMavenLocal
./gradlew publishToMavenLocal --warning-mode all

publish-remote: publish
./gradlew publishMavenJavaPublicationToMavenRepository
./gradlew publishMavenJavaPublicationToMavenRepository --warning-mode all

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ subprojects {
mavenCentral()
}

def javaVersion = JavaVersion.VERSION_11
def javaVersion = JavaVersion.VERSION_17
java {
toolchain {
languageVersion = JavaLanguageVersion.of(javaVersion.toString())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public Resource(Reader in, String href) throws IOException {
*
* Assumes that if the data is of a text type (html/css/etc) then the encoding will be UTF-8
*
* It is recommended to us the {@link #Resource(Reader, String)} method for creating textual
* It is recommended to use the {@code #Resource(Reader, String)} method for creating textual
* (html/css/etc) resources to prevent encoding problems.
* Use this method only for binary Resources like images, fonts, etc.
*
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit d1ce9c7

Please sign in to comment.