Skip to content

Commit

Permalink
Merge pull request #3 from stuartraetaylor/java17
Browse files Browse the repository at this point in the history
Support Java 17
  • Loading branch information
stuartraetaylor authored Sep 6, 2023
2 parents dadac5f + 0c9edf1 commit 62ddc1e
Show file tree
Hide file tree
Showing 6 changed files with 180 additions and 120 deletions.
20 changes: 15 additions & 5 deletions .github/workflows/build_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,27 @@ permissions:

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
- uses: actions/checkout@v4
with:
fetchDepth: 1
submodules: true

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'

- name: Build with Gradle
uses: gradle/gradle-build-action@bd5760595778326ba7f1441bcf7e88b49de61a25 # v2.6.0
uses: gradle/gradle-build-action@v2
with:
arguments: build

- name: Run with Gradle
uses: gradle/gradle-build-action@v2
with:
arguments: run

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The BeerXML exported recipes are available here: https://github.com/stuartraetay

git clone --recursive https://github.com/stuartraetaylor/punkapi-export-java.git

2. Run the exporter (requires Java 11).
2. Run the exporter (requires Java 17).

cd punkapi-export-java
./gradlew run
Expand Down
19 changes: 10 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@ plugins {
id 'java'
id 'application'
id 'jsonschema2pojo'
id 'com.github.jk1.dependency-license-report' version '1.6'
id 'com.github.seanrl.jaxb' version '2.5.1'
id 'com.github.jk1.dependency-license-report' version '2.4'
id 'com.github.seanrl.jaxb' version '2.5.4'
}

group = 'com.github.stuartraetaylor.punkapiexport'
version = '0.1.0'
version = '0.2.0'

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(17)
}
}

repositories {
mavenLocal()
mavenCentral()
}

String jaxbVersion = '3.0.1'
String jaxbVersion = '4.0.0'

dependencies {
implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.2'
Expand All @@ -40,12 +41,12 @@ dependencies {
defaultTasks 'build'

wrapper {
distributionType = Wrapper.DistributionType.ALL
gradleVersion = '7.3.3'
distributionType = Wrapper.DistributionType.BIN
gradleVersion = '8.3'
}

jar {
baseName = 'pinkapiexport'
archiveBaseName = 'pinkapiexport'
}

processResources {
Expand All @@ -57,7 +58,7 @@ processResources {
}

application {
mainClassName = "${group}.Main"
mainClass = "${group}.Main"
}

jsonSchema2Pojo {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 62ddc1e

Please sign in to comment.