Skip to content

Commit 65bf4d6

Browse files
Merge pull request #206 from yusufugurozbek/next
release: version 1.1.4 🔖
2 parents fd29658 + 0aac1d1 commit 65bf4d6

File tree

12 files changed

+46
-64
lines changed

12 files changed

+46
-64
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
# Trigger the workflow on any pull request
2121
pull_request:
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
25+
cancel-in-progress: true
26+
2327
jobs:
2428

2529
# Prepare environment and build the plugin
@@ -38,7 +42,7 @@ jobs:
3842

3943
# Validate wrapper
4044
- name: Gradle Wrapper Validation
41-
uses: gradle/wrapper-validation-action@v1.1.0
45+
uses: gradle/wrapper-validation-action@v2
4246

4347
# Set up Java environment for the next steps
4448
- name: Setup Java
@@ -49,7 +53,7 @@ jobs:
4953

5054
# Setup Gradle
5155
- name: Setup Gradle
52-
uses: gradle/gradle-build-action@v2
56+
uses: gradle/actions/setup-gradle@v3
5357
with:
5458
gradle-home-cache-cleanup: true
5559

@@ -113,7 +117,7 @@ jobs:
113117

114118
# Setup Gradle
115119
- name: Setup Gradle
116-
uses: gradle/gradle-build-action@v2
120+
uses: gradle/actions/setup-gradle@v3
117121
with:
118122
gradle-home-cache-cleanup: true
119123

@@ -131,7 +135,7 @@ jobs:
131135

132136
# Upload the Kover report to CodeCov
133137
- name: Upload Code Coverage Report
134-
uses: codecov/codecov-action@v3
138+
uses: codecov/codecov-action@v4
135139
with:
136140
files: ${{ github.workspace }}/build/reports/kover/report.xml
137141

@@ -166,7 +170,7 @@ jobs:
166170

167171
# Run Qodana inspections
168172
- name: Qodana - Code Inspection
169-
uses: JetBrains/qodana-action@v2023.3.0
173+
uses: JetBrains/qodana-action@v2023.3.2
170174
with:
171175
cache-default-branch-only: true
172176

@@ -197,13 +201,13 @@ jobs:
197201

198202
# Setup Gradle
199203
- name: Setup Gradle
200-
uses: gradle/gradle-build-action@v2
204+
uses: gradle/actions/setup-gradle@v3
201205
with:
202206
gradle-home-cache-cleanup: true
203207

204208
# Cache Plugin Verifier IDEs
205209
- name: Setup Plugin Verifier IDEs Cache
206-
uses: actions/cache@v3
210+
uses: actions/cache@v4
207211
with:
208212
path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
209213
key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
@@ -235,13 +239,6 @@ jobs:
235239
- name: Fetch Sources
236240
uses: actions/checkout@v4
237241

238-
# Set up Java environment for the next steps
239-
- name: Setup Java
240-
uses: actions/setup-java@v4
241-
with:
242-
distribution: zulu
243-
java-version: 17
244-
245242
# Remove old release drafts by using the curl request for the available releases with a draft flag
246243
- name: Remove Old Release Drafts
247244
env:
@@ -256,7 +253,7 @@ jobs:
256253
env:
257254
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
258255
run: |
259-
gh release create v${{ needs.build.outputs.version }} \
256+
gh release create "v${{ needs.build.outputs.version }}" \
260257
--draft \
261258
--title "v${{ needs.build.outputs.version }}" \
262259
--notes "$(cat << 'EOM'

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
# Setup Gradle
3535
- name: Setup Gradle
36-
uses: gradle/gradle-build-action@v2
36+
uses: gradle/actions/setup-gradle@v3
3737
with:
3838
gradle-home-cache-cleanup: true
3939

.github/workflows/run-ui-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
# Setup Gradle
4646
- name: Setup Gradle
47-
uses: gradle/gradle-build-action@v2
47+
uses: gradle/actions/setup-gradle@v3
4848
with:
4949
gradle-home-cache-cleanup: true
5050

@@ -54,7 +54,7 @@ jobs:
5454

5555
# Wait for IDEA to be started
5656
- name: Health Check
57-
uses: jtalk/url-health-check-action@v3
57+
uses: jtalk/url-health-check-action@v4
5858
with:
5959
url: http://127.0.0.1:8082
6060
max-attempts: 15

.run/Run Qodana.run.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Qodana" type="GradleRunConfiguration" factoryName="Gradle">
33
<ExternalSystemSettings>
4-
<option name="env">
5-
<map>
6-
<entry key="QODANA_SHOW_REPORT" value="true" />
7-
</map>
8-
</option>
94
<option name="executionName" />
105
<option name="externalProjectPath" value="$PROJECT_DIR$" />
116
<option name="externalSystemIdString" value="GRADLE" />
@@ -15,8 +10,7 @@
1510
</option>
1611
<option name="taskNames">
1712
<list>
18-
<option value="cleanInspections" />
19-
<option value="runInspections" />
13+
<option value="qodanaScan" />
2014
</list>
2115
</option>
2216
<option name="vmOptions" />

.run/Run Tests.run.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>true</RunAsTest>
2223
<method v="2" />
2324
</configuration>
2425
</component>

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# Testcontainers Port Updater Changelog
22

33
## [Unreleased]
4+
- Bump dependencies to their latest versions
5+
- Support latest IntelliJ 2024.1
6+
- Bump Gradle version to 8.7
7+
- Migrate latest changes of intellij-platform-plugin-template v1.13
8+
49

510
## [1.1.3] - 2023-12-09
611

build.gradle.kts

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,9 @@ dependencies {
2626
// implementation(libs.annotations)
2727
}
2828

29-
// Set the JVM language level used to build the project. Use Java 11 for 2020.3+, and Java 17 for 2022.2+.
29+
// Set the JVM language level used to build the project.
3030
kotlin {
31-
@Suppress("UnstableApiUsage")
32-
jvmToolchain {
33-
languageVersion = JavaLanguageVersion.of(17)
34-
vendor = JvmVendorSpec.JETBRAINS
35-
}
31+
jvmToolchain(properties("javaVersion").get().toInt())
3632
}
3733

3834
// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
@@ -51,14 +47,6 @@ changelog {
5147
repositoryUrl = properties("pluginRepositoryUrl")
5248
}
5349

54-
// Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
55-
qodana {
56-
cachePath = provider { file(".qodana").canonicalPath }
57-
reportPath = provider { file("build/reports/inspections").canonicalPath }
58-
saveReport = true
59-
showReport = environment("QODANA_SHOW_REPORT").map { it.toBoolean() }.getOrElse(false)
60-
}
61-
6250
// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
6351
koverReport {
6452
defaults {
@@ -126,6 +114,6 @@ tasks {
126114
// The pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
127115
// Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
128116
// https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
129-
channels = properties("pluginVersion").map { listOf(it.split('-').getOrElse(1) { "default" }.split('.').first()) }
117+
channels = properties("pluginVersion").map { listOf(it.substringAfter('-', "").substringBefore('.').ifEmpty { "default" }) }
130118
}
131119
}

gradle.properties

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@
33
pluginGroup = com.github.yusufugurozbek.testcontainers.port.updater
44
pluginName = Testcontainers Port Updater
55
pluginRepositoryUrl = https://github.com/yusufugurozbek/testcontainers-port-updater
6-
pluginVersion = 1.1.3
6+
pluginVersion = 1.1.4
77

88
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
9-
pluginSinceBuild = 224
10-
pluginUntilBuild = 234.*
9+
pluginSinceBuild = 234
10+
pluginUntilBuild = 241.*
1111

1212
# IntelliJ Platform Properties -> https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html#configuration-intellij-extension
1313
platformType = IU
14-
platformVersion = 2023.2.5
14+
platformVersion = 2024.1
1515

1616
# Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
1717
platformPlugins = com.intellij.database
1818

1919
# Gradle Releases -> https://github.com/gradle/gradle/releases
20-
gradleVersion = 8.5
20+
gradleVersion = 8.7
2121
org.gradle.jvmargs=-Xmx1g
2222

2323
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
@@ -29,7 +29,4 @@ org.gradle.configuration-cache = true
2929
# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
3030
org.gradle.caching = true
3131

32-
# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
33-
systemProp.org.gradle.unsafe.kotlin.assignment = true
34-
3532
javaVersion = 17

gradle/libs.versions.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
annotations = "24.1.0"
44

55
# plugins
6-
kotlin = "1.9.22"
6+
kotlin = "1.9.23"
77
changelog = "2.2.0"
8-
gradleIntelliJPlugin = "1.16.1"
9-
qodana = "0.1.13"
10-
kover = "0.7.5"
8+
gradleIntelliJPlugin = "1.17.3"
9+
qodana = "2023.3.1"
10+
kover = "0.7.6"
1111

1212
[libraries]
1313
annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)