Bump to 222 beta (#3208)

Author: rli

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

@@ -131,37 +131,39 @@ object IdeVersions {
             name = "2022.2",
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
-                sdkVersion = "222.2964-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "222.3345-EAP-CANDIDATE-SNAPSHOT",
                 plugins = commonPlugins + listOf(
                     "java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "PythonCore:222.2964.16",
-                    "Docker:222.2964.63"
+                    "PythonCore:222.3345.16",
+                    "Docker:222.3345.16"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
-                sdkVersion = "222.2964-EAP-CANDIDATE-SNAPSHOT",
+                sdkVersion = "222.3345-EAP-CANDIDATE-SNAPSHOT",
                 plugins = commonPlugins + listOf(
                     "JavaScript",
                     // Transitive dependency needed for javascript
                     // Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
                     "com.intellij.css",
                     "JavaScriptDebugger",
                     "com.intellij.database",
-                    "Pythonid:222.2964.55",
-                    "org.jetbrains.plugins.go:222.2964.55"
+                    "Pythonid:222.3345.16",
+                    "org.jetbrains.plugins.go:222.3345.16",
+                    // https://github.com/JetBrains/gradle-intellij-plugin/issues/1056
+                    "org.intellij.intelliLang"
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2022.2-EAP4-SNAPSHOT",
+                sdkVersion = "2022.2-EAP8-SNAPSHOT",
                 plugins = commonPlugins + listOf(
                     "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
                 ),
                 netFrameworkTarget = "net472",
-                rdGenVersion = "2022.2.1",
-                nugetVersion = "2022.2.0-eap04"
+                rdGenVersion = "2022.2.4",
+                nugetVersion = "2022.2.0-eap08"
             )
         )
 

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ assertJ = "3.20.2" # Upgrading leads to SAM errors: https://youtrack.jetbrains.c
 awsSdk = "2.17.219"
 commonmark = "0.17.1"
 detekt = "1.20.0"
-intellijGradle = "1.7.0-20220613.010908-17"
+intellijGradle = "1.7.0"
 intellijRemoteRobot = "0.11.14"
 jackson = "2.11.1"
 jacoco = "0.8.8"

jetbrains-core/src-212-221/software/aws/toolkits/jetbrains/core/docker/compatability/DockerRegistry.kt

@@ -0,0 +1,6 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.core.docker.compatability
+
+typealias DockerRegistry = com.intellij.docker.registry.DockerRegistry

jetbrains-core/src-222+/software/aws/toolkits/jetbrains/core/docker/compatability/DockerRegistry.kt

@@ -0,0 +1,6 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.core.docker.compatability
+
+typealias DockerRegistry = com.intellij.docker.registry.DockerRegistryConfiguration

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/EcrUtils.kt

@@ -8,7 +8,6 @@ import com.intellij.docker.DockerCloudType
 import com.intellij.docker.DockerDeploymentConfiguration
 import com.intellij.docker.DockerServerRuntimeInstance
 import com.intellij.docker.deploymentSource.DockerFileDeploymentSourceType
-import com.intellij.docker.registry.DockerRegistry
 import com.intellij.docker.registry.DockerRepositoryModel
 import com.intellij.execution.RunManager
 import com.intellij.execution.RunnerAndConfigurationSettings
@@ -31,6 +30,7 @@ import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.jetbrains.core.coroutines.getCoroutineUiContext
 import software.aws.toolkits.jetbrains.core.docker.ToolkitDockerAdapter
+import software.aws.toolkits.jetbrains.core.docker.compatability.DockerRegistry
 import software.aws.toolkits.jetbrains.services.ecr.resources.Repository
 import software.aws.toolkits.jetbrains.utils.notifyError
 import software.aws.toolkits.resources.message

jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/CredentialsRegionHandlerTest.kt

@@ -174,7 +174,7 @@ class CredentialsRegionHandlerTest {
         val notification = getOnlyNotification()
 
         runInEdtAndWait {
-            Notification.fire(notification, notification.actions.first { it.templateText == "Always" }, TestDataProvider(projectRule.project))
+            Notification.fire(notification, notification.actions.first { it.templateText == "Always" }, TestDataProvider(projectRule.project)::getData)
         }
 
         assertThat(AwsSettings.getInstance().useDefaultCredentialRegion).isEqualTo(UseAwsCredentialRegion.Always)

jetbrains-core/tst/software/aws/toolkits/jetbrains/core/credentials/RefreshConnectionActionTest.kt

@@ -3,9 +3,9 @@
 
 package software.aws.toolkits.jetbrains.core.credentials
 
+import com.intellij.openapi.actionSystem.DataContext
 import com.intellij.testFramework.ProjectRule
 import com.intellij.testFramework.TestActionEvent
-import com.intellij.testFramework.TestDataProvider
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Rule
 import org.junit.Test
@@ -85,5 +85,5 @@ class RefreshConnectionActionTest {
         assertThat(actionEvent.presentation.isEnabled).isEqualTo(shouldBeEnabled)
     }
 
-    private fun testAction() = TestActionEvent(TestDataProvider(projectRule.project))
+    private fun testAction() = TestActionEvent(DataContext { projectRule.project })
 }