Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Publish v5.3.1-SNAPSHOT #258

Closed
wants to merge 3 commits into from
Closed

chore: Publish v5.3.1-SNAPSHOT #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94020d8
chore: update generate SDK action version
anssari1 Jan 19, 2025
14f5f69
running examples before releasing an SDK occasionally fails because o…
anssari1 Jan 19, 2025
5ccd96f
chore: Publish v5.3.1-SNAPSHOT
anssari1 Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/generate-and-publish-sdk-sources.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ on:

jobs:
generate-and-publish-sources:
uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-full-workflow.yaml@v20241126
uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-full-workflow.yaml@v20241217
secrets: inherit
with:
name: rapid
version: ${{ inputs.version }}
transformations: "-th -te /v3 --operationIdsToTags"
repository: 'ExpediaGroup/rapid-java-sdk'
sdk_repo_ref: ${{ inputs.sdk_repo_ref }}
sdk_repo_ref: ${{ inputs.sdk_repo_ref || 'v20241217' }}
20 changes: 10 additions & 10 deletions .github/workflows/release-sdk.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@ on:
default: ''

jobs:
run-examples:
strategy:
matrix:
jdk: [ 8, 11, 17, 21 ]
uses: ./.github/workflows/run-examples.yaml
secrets: inherit
with:
branch: ${{ inputs.branch }}
jdk: ${{ matrix.jdk }}
# run-examples:
# strategy:
# matrix:
# jdk: [ 8, 11, 17, 21 ]
# uses: ./.github/workflows/run-examples.yaml
# secrets: inherit
# with:
# branch: ${{ inputs.branch }}
# jdk: ${{ matrix.jdk }}

release-sdk:
uses: ExpediaGroup/expediagroup-java-sdk/.github/workflows/selfserve-release-sdk.yaml@v20241126
needs: [ run-examples ]
# needs: [ run-examples ]
secrets: inherit
with:
branch: ${{ inputs.branch }}
2 changes: 1 addition & 1 deletion code/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<dependency>
<groupId>com.expediagroup</groupId>
<artifactId>rapid-sdk</artifactId>
<version>5.3.0</version>
<version>5.3.1-SNAPSHOT</version>
</dependency>
```

Expand Down
8 changes: 4 additions & 4 deletions code/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.expediagroup</groupId>
<artifactId>rapid-sdk</artifactId>
<version>5.3.0</version>
<version>5.3.1-SNAPSHOT</version>
<name>EG rapid-sdk for Java</name>
<description>EG rapid-sdk v5.3.0</description>
<description>EG rapid-sdk v5.3.1-SNAPSHOT</description>
<url>https://github.com/ExpediaGroup/test-sdk</url>
<inceptionYear>2022</inceptionYear>
<packaging>jar</packaging>
Expand Down Expand Up @@ -744,13 +744,13 @@
<dependency>
<groupId>com.ebay.ejmask</groupId>
<artifactId>ejmask-api</artifactId>
<version>1.2.1</version>
<version>1.3.0</version>
</dependency>

<dependency>
<groupId>com.ebay.ejmask</groupId>
<artifactId>ejmask-extensions</artifactId>
<version>1.2.1</version>
<version>1.3.0</version>
</dependency>
</dependencies>

Expand Down
5 changes: 4 additions & 1 deletion code/src/main/kotlin/com/expediagroup/sdk/core/client/BaseRapidClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ abstract class BaseRapidClient(
private val engine: HttpClientEngine =
_configurationProvider.okHttpClient?.let {
OkHttp.create {
preconfigured = it
config {
preconfigured = it
dispatcher(it.dispatcher)
}
}
} ?: httpClientEngine

Expand Down
5 changes: 4 additions & 1 deletion code/src/main/kotlin/com/expediagroup/sdk/core/client/BaseXapClient.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ abstract class BaseXapClient(
private val engine: HttpClientEngine =
_configurationProvider.okHttpClient?.let {
OkHttp.create {
preconfigured = it
config {
preconfigured = it
dispatcher(it.dispatcher)
}
}
} ?: httpClientEngine

Expand Down
Loading