Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
cmdjulian committed Sep 5, 2023
2 parents d0b4042 + 5cc91a8 commit 7c7b2d3
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ jobs:
contents: read
packages: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
- name: Validate Gradle wrapper
uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4
- name: Publish package
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
uses: gradle/gradle-build-action@3bfe3a46584a206fb8361cdedd0647b0c4204232
with:
arguments: publishAllPublicationsToGitHubPackagesRepository
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'liberica'
- name: Build with Gradle
uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c
uses: gradle/gradle-build-action@3bfe3a46584a206fb8361cdedd0647b0c4204232
with:
arguments: check assemble
2 changes: 1 addition & 1 deletion aot-smoke-test/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
application
id("org.graalvm.buildtools.native") version "0.9.24"
id("org.graalvm.buildtools.native") version "0.9.25"
}

application {
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import org.jlleitschuh.gradle.ktlint.KtlintExtension
import java.util.*

plugins {
kotlin("jvm") version "1.9.0" apply false
kotlin("jvm") version "1.9.10" apply false
kotlin("libs.publisher") version "0.0.61-dev-34"
id("org.jlleitschuh.gradle.ktlint") version "11.5.1" apply false
id("org.owasp.dependencycheck") version "8.3.1" apply false // "dependencyCheckAnalyze"
id("org.owasp.dependencycheck") version "8.4.0" apply false // "dependencyCheckAnalyze"
id("com.github.ben-manes.versions") version "0.47.0" apply false // "dependencyUpdates --refresh-dependencies"
id("me.qoomon.git-versioning") version "6.4.2"
}
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.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion kirc-suspending/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
implementation("io.github.microutils:kotlin-logging-jvm:3.0.5")

// insecure connections
implementation("io.github.hakky54:sslcontext-kickstart:8.1.5")
implementation("io.github.hakky54:sslcontext-kickstart:8.1.6")

// tests
testImplementation(platform(tests.junit.bom))
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ dependencyResolutionManagement {
library("junit-engine", "org.junit.jupiter", "junit-jupiter-engine").withoutVersion()
bundle("junit", listOf("junit-api", "junit-params", "junit-engine"))

version("kotest", "5.6.2")
version("kotest", "5.7.1")
library("kotest-runner", "io.kotest", "kotest-runner-junit5").versionRef("kotest")
library("kotest-assertions", "io.kotest", "kotest-assertions-core-jvm").versionRef("kotest")
bundle("kotest", listOf("kotest-runner", "kotest-assertions"))
Expand Down

0 comments on commit 7c7b2d3

Please sign in to comment.