Skip to content

Commit c1cbbc0

Browse files
mustard-mhroboquat
andauthored
Update platform version of JetBrains Gateway Plugin (EAP) (#20273)
* Update Platform Version of JetBrains Gateway Plugin (EAP) to * Fix stable warnings * Fix EAP build * Revert URL changes * Fix class cast bug --------- Co-authored-by: Robo Quat <[email protected]>
1 parent 46ab1b8 commit c1cbbc0

File tree

12 files changed

+220
-152
lines changed

12 files changed

+220
-152
lines changed

components/ide/jetbrains/gateway-plugin/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
// See License.AGPL.txt in the project root for license information.
44

55
import io.gitlab.arturbosch.detekt.Detekt
6-
import org.jetbrains.changelog.Changelog
76
import org.jetbrains.changelog.markdownToHTML
87
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
8+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
99
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1010

1111
fun properties(key: String) = project.findProperty(key).toString()
@@ -146,7 +146,9 @@ tasks.withType<Detekt> {
146146
}
147147

148148
tasks.withType<KotlinCompile> {
149-
kotlinOptions.jvmTarget = "21"
149+
compilerOptions {
150+
jvmTarget.set(JvmTarget.JVM_21)
151+
}
150152
}
151153

152154
tasks.withType<JavaCompile> {
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
# Code generated by gha-update-image/index-jb-platform-update.ts. DO NOT EDIT.
22
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
33
# for insight into build numbers and IntelliJ Platform versions.
4-
pluginSinceBuild=242.20224
5-
pluginUntilBuild=242.*
4+
# revert pluginSinceBuild if it's unnecessary
5+
pluginSinceBuild=243.18137
6+
pluginUntilBuild=243.*
67
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
78
# See https://jb.gg/intellij-platform-builds-list for available build versions.
8-
pluginVerifierIdeVersions=2024.2
9+
pluginVerifierIdeVersions=2024.3
910
# Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
10-
platformVersion=242.20224.368
11+
platformVersion=243.18137.22

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/auth/GitpodAuthCallbackHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ internal class GitpodAuthCallbackHandler : RestService() {
2525
request: FullHttpRequest,
2626
context: ChannelHandlerContext
2727
): String? {
28-
service.handleServerCallback(urlDecoder.path(), urlDecoder.parameters())
28+
service.handleOAuthServerCallback(urlDecoder.path(), urlDecoder.parameters())
2929
sendResponse(
3030
request,
3131
context,

components/ide/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/auth/GitpodAuthService.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import com.intellij.ide.passwordSafe.PasswordSafe
1919
import com.intellij.openapi.Disposable
2020
import com.intellij.openapi.components.Service
2121
import com.intellij.openapi.components.service
22-
import com.intellij.util.Base64
2322
import com.intellij.util.EventDispatcher
2423
import com.intellij.util.Url
2524
import com.intellij.util.Urls.encodeParameters
@@ -138,7 +137,7 @@ internal class GitpodAuthService : OAuthServiceBase<Credentials>() {
138137

139138
val jwt = with(jacksonMapper) {
140139
propertyNamingStrategy = PropertyNamingStrategies.LowerCaseStrategy()
141-
readValue(Base64.decode(responseData.accessToken.split('.')[1]), JsonWebToken::class.java)
140+
readValue(Base64.getDecoder().decode(responseData.accessToken.split('.')[1]), JsonWebToken::class.java)
142141
}
143142
SimpleCredentials(jwt.jti)
144143
}
@@ -178,7 +177,7 @@ internal class GitpodAuthService : OAuthServiceBase<Credentials>() {
178177

179178
suspend fun authorize(gitpodHost: String): String {
180179
val accessToken = instance.authorize(gitpodHost).await().accessToken
181-
setAccessToken(gitpodHost, accessToken!!)
180+
setAccessToken(gitpodHost, accessToken)
182181
return accessToken
183182
}
184183

0 commit comments

Comments
 (0)