Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/gradle/org.jetbrains.dokka-1.9.20
Browse files Browse the repository at this point in the history
  • Loading branch information
0x6675636b796f75676974687562 authored Oct 31, 2024
2 parents 68a1f8b + 2d7274f commit 1040d94
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ jobs:

- name: 'Run unit tests'
id: test
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down Expand Up @@ -329,7 +329,7 @@ jobs:

- name: 'Publish a release'
id: publish
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper
arguments: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ jobs:

- name: 'Set up Gradle'
id: build
uses: gradle/gradle-build-action@v2
uses: gradle/gradle-build-action@v3
with:
gradle-version: wrapper

# `gradlew :jna-lib:dependencies --configuration compileClasspath`
- name: 'Run snapshot action'
uses: mikepenz/gradle-dependency-submission@v0.9.1
uses: mikepenz/gradle-dependency-submission@v1.0.0
with:
use-gradlew: true
gradle-build-module: |-
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
id("org.jetbrains.dokka") version "1.9.20"

kotlin("jvm") version "1.9.22" apply false
kotlin("jvm") version "2.0.21" apply false
}

subprojects {
Expand Down
2 changes: 1 addition & 1 deletion jna-lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ repositories {
dependencies {
implementation(platform("org.jetbrains.kotlin:kotlin-bom"))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
api("net.java.dev.jna:jna:5.14.0")
api("net.java.dev.jna:jna:5.15.0")
}

testing {
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {
}

plugins {
id("com.gradle.enterprise") version "3.16.1"
id("com.gradle.enterprise") version "3.18.1"
}

include("jna-lib")
Expand Down

0 comments on commit 1040d94

Please sign in to comment.