Skip to content

Commit f2b31dd

Browse files
authored
Bump profiles for 221 prod release (#3119)
1 parent 4a03425 commit f2b31dd

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "feature",
3+
"description" : "Add support for 2022.1"
4+
}

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,37 +131,37 @@ object IdeVersions {
131131
name = "2022.1",
132132
community = ProductProfile(
133133
sdkFlavor = IdeFlavor.IC,
134-
sdkVersion = "221.5080-EAP-CANDIDATE-SNAPSHOT",
134+
sdkVersion = "2022.1",
135135
plugins = commonPlugins + listOf(
136136
"java",
137137
"com.intellij.gradle",
138138
"org.jetbrains.idea.maven",
139-
"PythonCore:221.5080.106",
140-
"Docker:221.5080.106"
139+
"PythonCore:221.5080.216",
140+
"Docker:221.5080.126"
141141
)
142142
),
143143
ultimate = ProductProfile(
144144
sdkFlavor = IdeFlavor.IU,
145-
sdkVersion = "221.5080-EAP-CANDIDATE-SNAPSHOT",
145+
sdkVersion = "2022.1",
146146
plugins = commonPlugins + listOf(
147147
"JavaScript",
148148
// Transitive dependency needed for javascript
149149
// Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
150150
"com.intellij.css",
151151
"JavaScriptDebugger",
152152
"com.intellij.database",
153-
"Pythonid:221.5080.93",
154-
"org.jetbrains.plugins.go:221.5080.93"
153+
"Pythonid:221.5080.212",
154+
"org.jetbrains.plugins.go:221.5080.210"
155155
)
156156
),
157157
rider = RiderProfile(
158-
sdkVersion = "2022.1-EAP9-SNAPSHOT",
158+
sdkVersion = "2022.1-EAP10-SNAPSHOT",
159159
plugins = commonPlugins + listOf(
160160
"rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
161161
),
162162
netFrameworkTarget = "net472",
163163
rdGenVersion = "2022.1.3",
164-
nugetVersion = "2022.1.0-eap09"
164+
nugetVersion = "2022.1.0-eap10"
165165
)
166166
)
167167
).associateBy { it.name }

jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/services/lambda/go/GoRuntimeGroupTest.kt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
package software.aws.toolkits.jetbrains.services.lambda.go
55

66
import com.goide.sdk.GoSdkService
7-
import com.intellij.testFramework.runInEdtAndWait
7+
import com.intellij.testFramework.replaceService
88
import org.assertj.core.api.Assertions.assertThat
99
import org.junit.Rule
1010
import org.junit.Test
11+
import org.mockito.kotlin.any
12+
import org.mockito.kotlin.spy
13+
import org.mockito.kotlin.whenever
1114
import software.aws.toolkits.core.lambda.LambdaRuntime
1215
import software.aws.toolkits.jetbrains.utils.rules.GoCodeInsightTestFixtureRule
13-
import software.aws.toolkits.jetbrains.utils.rules.createMockSdk
1416

1517
class GoRuntimeGroupTest {
1618
@Rule
@@ -21,10 +23,10 @@ class GoRuntimeGroupTest {
2123

2224
@Test
2325
fun runtimeForSdk() {
24-
val sdk = createMockSdk(projectRule.module.moduleFilePath, "1.0.0")
25-
runInEdtAndWait {
26-
GoSdkService.getInstance(projectRule.project).setSdk(sdk)
27-
}
26+
val goSdkService = spy(GoSdkService.getInstance(projectRule.project))
27+
whenever(goSdkService.isGoModule(any())).thenReturn(true)
28+
projectRule.project.replaceService(GoSdkService::class.java, goSdkService, projectRule.fixture.projectDisposable)
29+
2830
val module = projectRule.module
2931
val runtime = sut.determineRuntime(module)
3032
assertThat(runtime).isEqualTo(LambdaRuntime.GO1_X)

jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/GoCodeInsightTestFixtureRule.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ package software.aws.toolkits.jetbrains.utils.rules
66
import com.goide.GoConstants
77
import com.goide.project.GoModuleSettings
88
import com.goide.psi.GoFile
9-
import com.goide.sdk.GoSdk
10-
import com.goide.sdk.GoSdkImpl
119
import com.intellij.execution.configurations.GeneralCommandLine
1210
import com.intellij.execution.util.ExecUtil
1311
import com.intellij.openapi.Disposable
@@ -151,5 +149,3 @@ private fun GeneralCommandLine.runAndValidateCommand() {
151149
val output = ExecUtil.execAndGetOutput(this)
152150
check(output.exitCode == 0) { "${this.commandLineString} failed!\n ${output.stderr}" }
153151
}
154-
155-
fun createMockSdk(root: String, version: String): GoSdk = GoSdkImpl(root, version, null)

0 commit comments

Comments
 (0)