Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/gradle/net.java.dev.jna-jna-5.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
0x6675636b796f75676974687562 authored Jul 31, 2024
2 parents 4570242 + 98ad7b2 commit 5ac103f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
jna-os: linux
- os: windows-latest
jna-os: win32
- os: macos-latest
- os: macos-13
jna-os: darwin
- arch: x86
jna-arch: x86
Expand All @@ -62,6 +62,7 @@ jobs:
uses: egor-tensin/setup-mingw@v2
with:
platform: ${{ matrix.arch }}
version: 12.2.0

- name: 'Set up MinGW environment'
if: ${{ runner.os == 'Windows' }}
Expand Down Expand Up @@ -91,7 +92,7 @@ jobs:
echo "|$(arch)|$(uname -m)|$(cmake --version | head -n1)|$(which "${CC}")|$("${CC}" --version | head -n1)|$("${CC}" -dumpmachine)|" >>${GITHUB_STEP_SUMMARY}
shell: bash

- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

Expand Down Expand Up @@ -167,7 +168,7 @@ jobs:
jna-os: linux
- os: windows-latest
jna-os: win32
- os: macos-latest
- os: macos-13
jna-os: darwin
- arch: x86
jna-arch: x86
Expand All @@ -193,7 +194,7 @@ jobs:
statuses: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Fetch Git tags, so that semantic version can be calculated.
# Alternatively, run `git fetch --prune --unshallow --tags` as the
Expand Down Expand Up @@ -259,7 +260,7 @@ jobs:
packages: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Fetch Git tags, so that semantic version can be calculated.
# Alternatively, run `git fetch --prune --unshallow --tags` as the
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
contents: write

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# Fetch Git tags, so that semantic version can be calculated.
# Alternatively, run `git fetch --prune --unshallow --tags` as the
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
id("org.jetbrains.dokka") version "1.8.20"
id("org.jetbrains.dokka") version "1.9.10"

kotlin("jvm") version "1.9.0" apply false
}
Expand Down

0 comments on commit 5ac103f

Please sign in to comment.