Skip to content

Commit 59aaab5

Browse files
Merge branch 'main' into mdwairi/release-v1.0.0
2 parents ad75a4b + 79f3112 commit 59aaab5

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/build-and-test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v4
1414

1515
- name: Setup JDK 11
16-
uses: actions/setup-java@v3
16+
uses: actions/setup-java@v4
1717
with:
1818
distribution: 'temurin'
1919
java-version: '11'
@@ -28,7 +28,7 @@ jobs:
2828
uses: actions/checkout@v4
2929

3030
- name: Setup JDK 17
31-
uses: actions/setup-java@v3
31+
uses: actions/setup-java@v4
3232
with:
3333
distribution: 'temurin'
3434
java-version: '17'

.github/workflows/manual-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
token: ${{ secrets.GITHUB_TOKEN }}
2828

2929
- name: Setup JDK 11
30-
uses: actions/setup-java@v3
30+
uses: actions/setup-java@v4
3131
with:
3232
distribution: 'temurin'
3333
java-version: '11'

.github/workflows/snapshot-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
ref: ${{ inputs.branch }}
1818

1919
- name: Set Up JDK
20-
uses: actions/setup-java@v3
20+
uses: actions/setup-java@v4
2121
with:
2222
distribution: 'temurin'
2323
java-version: '17'

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import java.time.Duration
55
plugins {
66
id 'java'
77
id 'org.jetbrains.kotlin.jvm' version '2.2.0' apply false
8-
id "org.jlleitschuh.gradle.ktlint" version "12.1.2" apply false
8+
id "org.jlleitschuh.gradle.ktlint" version "12.3.0" apply false
99
id 'org.jetbrains.kotlinx.kover' version "0.9.1" apply false
1010
id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'
1111
}

exemplar/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id("java")
3-
id("org.jetbrains.kotlin.jvm") version "2.1.10"
4-
id("org.jlleitschuh.gradle.ktlint") version "12.1.2"
3+
id("org.jetbrains.kotlin.jvm") version "2.2.0"
4+
id("org.jlleitschuh.gradle.ktlint") version "12.3.0"
55
}
66

77
group = "com.expediagroup"

exemplar/exemplar-playground-java/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ dependencies {
1414
implementation(project(":exemplar-sdk-rest"))
1515
implementation(project(":exemplar-sdk-graphql"))
1616

17-
implementation("org.apache.logging.log4j:log4j-api:2.24.3")
18-
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.24.3")
17+
implementation("org.apache.logging.log4j:log4j-api:2.25.1")
18+
implementation("org.apache.logging.log4j:log4j-slf4j2-impl:2.25.1")
1919
}
2020

2121
tasks.test {

expediagroup-sdk-core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ apply from: "$rootDir/gradle-tasks/signing.gradle"
1414

1515
dependencies {
1616
/* EG SDK Core */
17-
api 'com.squareup.okio:okio:3.15.0'
17+
api 'com.squareup.okio:okio:3.16.0'
1818

1919
/* Serialization/Deserialization */
2020
compileOnly(platform('com.fasterxml.jackson:jackson-bom:2.19.2'))

0 commit comments

Comments
 (0)