Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions components/ide/jetbrains/gateway-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// See License.AGPL.txt in the project root for license information.

import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.changelog.Changelog
import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

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

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "21"
compilerOptions {
jvmTarget.set(JvmTarget.JVM_21)
}
}

tasks.withType<JavaCompile> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Code generated by gha-update-image/index-jb-platform-update.ts. DO NOT EDIT.
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild=242.20224
pluginUntilBuild=242.*
# revert pluginSinceBuild if it's unnecessary
pluginSinceBuild=243.18137
pluginUntilBuild=243.*
# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
# See https://jb.gg/intellij-platform-builds-list for available build versions.
pluginVerifierIdeVersions=2024.2
pluginVerifierIdeVersions=2024.3
# Version from "com.jetbrains.gateway" which can be found at https://www.jetbrains.com/intellij-repository/snapshots
platformVersion=242.20224.368
platformVersion=243.18137.22
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal class GitpodAuthCallbackHandler : RestService() {
request: FullHttpRequest,
context: ChannelHandlerContext
): String? {
service.handleServerCallback(urlDecoder.path(), urlDecoder.parameters())
service.handleOAuthServerCallback(urlDecoder.path(), urlDecoder.parameters())
sendResponse(
request,
context,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import com.intellij.ide.passwordSafe.PasswordSafe
import com.intellij.openapi.Disposable
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.util.Base64
import com.intellij.util.EventDispatcher
import com.intellij.util.Url
import com.intellij.util.Urls.encodeParameters
Expand Down Expand Up @@ -138,7 +137,7 @@ internal class GitpodAuthService : OAuthServiceBase<Credentials>() {

val jwt = with(jacksonMapper) {
propertyNamingStrategy = PropertyNamingStrategies.LowerCaseStrategy()
readValue(Base64.decode(responseData.accessToken.split('.')[1]), JsonWebToken::class.java)
readValue(Base64.getDecoder().decode(responseData.accessToken.split('.')[1]), JsonWebToken::class.java)
}
SimpleCredentials(jwt.jti)
}
Expand Down Expand Up @@ -178,7 +177,7 @@ internal class GitpodAuthService : OAuthServiceBase<Credentials>() {

suspend fun authorize(gitpodHost: String): String {
val accessToken = instance.authorize(gitpodHost).await().accessToken
setAccessToken(gitpodHost, accessToken!!)
setAccessToken(gitpodHost, accessToken)
return accessToken
}

Expand Down
Loading
Loading