Skip to content

Commit e086d97

Browse files
authored
Merge pull request #1032 from JetBrains/rival/target-eap-7
Target eap 7
2 parents 11b1e69 + 4c33019 commit e086d97

File tree

6 files changed

+18
-18
lines changed

6 files changed

+18
-18
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ jobs:
144144
# Setup Gradle
145145
- name: Setup Gradle
146146
uses: gradle/actions/setup-gradle@v4
147+
with:
148+
cache-disabled: true
147149

148150
# Setup .NET 8 environment
149151
- name: Setup .NET

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ jobs:
114114
# Setup Gradle
115115
- name: Setup Gradle
116116
uses: gradle/actions/setup-gradle@v4
117+
with:
118+
cache-disabled: true
117119

118120
# Setup .NET 8 environment for the next steps
119121
- name: Setup .NET

PluginsAndFeatures/azure-toolkit-for-rider/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
## [Unreleased]
66

7+
### Changed
8+
9+
- Support for Rider 2025.1 EAP 7
10+
711
## [4.4.4] - 2025-02-28
812

913
### Changed

PluginsAndFeatures/azure-toolkit-for-rider/azure-intellij-plugin-appservice-dotnet/src/main/kotlin/com/microsoft/azure/toolkit/intellij/legacy/function/toolingFeed/FunctionsToolingFeedService.kt

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,18 @@ import io.ktor.client.engine.cio.*
2525
import io.ktor.client.plugins.contentnegotiation.*
2626
import io.ktor.client.request.*
2727
import io.ktor.serialization.kotlinx.json.*
28-
import io.ktor.utils.io.ByteReadChannel
29-
import io.ktor.utils.io.core.isEmpty
30-
import io.ktor.utils.io.core.readBytes
31-
import io.ktor.utils.io.readRemaining
28+
import io.ktor.utils.io.*
3229
import kotlinx.coroutines.Dispatchers
3330
import kotlinx.coroutines.sync.Mutex
3431
import kotlinx.coroutines.sync.withLock
3532
import kotlinx.coroutines.withContext
33+
import kotlinx.io.readByteArray
3634
import kotlinx.serialization.ExperimentalSerializationApi
3735
import kotlinx.serialization.json.Json
3836
import java.io.File
3937
import java.nio.file.Path
4038
import java.nio.file.attribute.PosixFilePermission
41-
import kotlin.io.path.ExperimentalPathApi
42-
import kotlin.io.path.Path
43-
import kotlin.io.path.createDirectories
44-
import kotlin.io.path.deleteRecursively
45-
import kotlin.io.path.exists
46-
import kotlin.io.path.isExecutable
47-
import kotlin.io.path.setPosixFilePermissions
39+
import kotlin.io.path.*
4840

4941
@Service(Service.Level.APP)
5042
class FunctionsToolingFeedService : Disposable {
@@ -172,8 +164,8 @@ class FunctionsToolingFeedService : Disposable {
172164
val channel: ByteReadChannel = httpResponse.body()
173165
while (!channel.isClosedForRead) {
174166
val packet = channel.readRemaining(DEFAULT_BUFFER_SIZE.toLong())
175-
while (!packet.isEmpty) {
176-
val bytes = packet.readBytes()
167+
while (!packet.exhausted()) {
168+
val bytes = packet.readByteArray()
177169
tempFile.appendBytes(bytes)
178170
}
179171
}

PluginsAndFeatures/azure-toolkit-for-rider/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginGroup = com.jetbrains
44
pluginName = azure-toolkit-for-rider
55
pluginRepositoryUrl = https://github.com/JetBrains/azure-tools-for-intellij
66
# SemVer format -> https://semver.org
7-
pluginVersion = 4.4.4
7+
pluginVersion = 4.4.5
88

99
# Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
1010
pluginSinceBuild = 251
@@ -15,7 +15,7 @@ pluginUntilBuild = 251.*
1515
# Release: 2020.2
1616
# EAP: 2020.3-EAP2-SNAPSHOT
1717
# Nightly: 2020.3-SNAPSHOT
18-
platformVersion = 2025.1-SNAPSHOT
18+
platformVersion = 2025.1-EAP7-SNAPSHOT
1919

2020
dotnetBuildConfiguration=Release
2121

PluginsAndFeatures/azure-toolkit-for-rider/gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
[versions]
22
# libraries
33
# https://search.maven.org/artifact/com.jetbrains.rd/rd-gen
4-
rdGen = "2024.3.1"
4+
rdGen = "2025.1.1"
55
opentest4j = "1.3.0"
66
azureToolkitLibs = "0.51.0"
77
azureToolkitHdinsightLibs = "0.1.1"
88
javaWebSocket = "1.5.1"
99
coroutines = "1.8.1"
10-
ktor = "2.3.12"
10+
ktor = "3.1.1"
1111
lombok = "1.18.24"
1212
snakeyaml = "2.2"
1313
plexusArchiver = "4.2.7"
1414
jedis = "3.6.3"
1515

1616
# plugins
17-
kotlin = "2.1.0"
17+
kotlin = "2.1.10"
1818
serialization = "1.8.0"
1919
changelog = "2.2.1"
2020
intelliJPlatform = "2.2.1"

0 commit comments

Comments
 (0)