Skip to content

Commit

Permalink
refactor(java): Misc changes (#191)
Browse files Browse the repository at this point in the history
- Add Java 20 to CI
- Use exact hashes for CI actions
- Fix broken link for models in README
- Fix artifact version in build.gradle and elsewhere
- Git ignore some files

---------

Co-authored-by: Raghd Hamzeh <[email protected]>
  • Loading branch information
booniepepper and rhamzeh authored Aug 28, 2023
1 parent 449aece commit e02fad0
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 6 deletions.
3 changes: 2 additions & 1 deletion config/clients/java/config.overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
"packageName": "dev.openfga:openfga-sdk",
"artifactId": "openfga-sdk",
"groupId": "dev.openfga",
"artifactVersion": "0.0.1",
"packageVersion": "0.0.1",
"apiPackage": "dev.openfga.sdk.api",
"invokerPackage": "dev.openfga.sdk.api.client",
"modelPackage": "dev.openfga.sdk.api.model",
"packageVersion": "0.0.1",
"snapshotVersion": false,
"packageDescription": "Java SDK for OpenFGA",
"artifactDescription": "Java SDK for OpenFGA",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ '11', '17' ]
java: [ '11', '17', '20' ]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.2
- name: Set up JDK
uses: actions/setup-java@v2
uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
with:
{{=< >=}}
java-version: ${{ matrix.java }}
Expand Down
4 changes: 3 additions & 1 deletion config/clients/java/template/README_models.mustache
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
[Models](https://{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/blob/main/apiModel.ts)
{{#models}}{{#model}}
- [{{{classname}}}](https://{{gitHost}}/{{gitUserId}}/{{gitRepoId}}/blob/main/docs/{{{classname}}}.md)
{{/model}}{{/models}}
4 changes: 4 additions & 0 deletions config/clients/java/template/gitignore.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ hs_err_pid*
target
.gradle
build

# openapi files
/api/openapi.yaml
VERSION.txt
2 changes: 1 addition & 1 deletion config/common/files/.github/workflows/semgrep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
image: returntocorp/semgrep
if: (github.actor != 'dependabot[bot]' && github.actor != 'snyk-bot')
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.2
- run: semgrep ci
env:
SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}

0 comments on commit e02fad0

Please sign in to comment.