Skip to content

Commit 1fa22f3

Browse files
authored
Upgrade to 2021.1 EAP beta 1 (#2485)
1 parent 983346b commit 1fa22f3

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

buildSrc/src/software/aws/toolkits/gradle/IdeVersions.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,21 @@ object IdeVersions {
7474
"java",
7575
"com.intellij.gradle",
7676
"org.jetbrains.idea.maven",
77-
"PythonCore:211.6085.26",
78-
"Docker:211.6085.26"
77+
"PythonCore:211.6305.22",
78+
"Docker:211.6305.15"
7979
),
8080
ultimatePlugins = listOf(
8181
"JavaScript",
8282
// Transitive dependency needed for javascript
8383
"com.intellij.css",
8484
"JavaScriptDebugger",
8585
"com.intellij.database",
86-
"Pythonid:211.6085.26"
86+
"Pythonid:211.6305.22"
8787
),
8888
riderSdkOverride = "2021.1-SNAPSHOT",
89-
ijSdkOverride = "211.6085-EAP-CANDIDATE-SNAPSHOT",
90-
rdGenVersion = "0.211.214",
91-
nugetVersion = "2021.1.0-eap03"
89+
ijSdkOverride = "211.6305-EAP-CANDIDATE-SNAPSHOT",
90+
rdGenVersion = "0.211.234",
91+
nugetVersion = "2021.1.0-eap06"
9292
)
9393
).associateBy { it.name }
9494

buildspec/linuxIntegrationTests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ phases:
2626
- apt-get update
2727
- apt-get install -y jq python2.7 python3.6 python3.7 python3.8 python3-pip python3-distutils
2828
# As of Ubuntu 20.4, there is no longer pip for Python 2, so we need to install it manually
29-
- curl https://bootstrap.pypa.io/2.7/get-pip.py --output get-pip.py
29+
- curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
3030
- python2 get-pip.py
3131
- aws sts assume-role --role-arn $ASSUME_ROLE_ARN --role-session-name integ-test > creds.json
3232
- export KEY_ID=`jq -r '.Credentials.AccessKeyId' creds.json`

testdata/samProjects/image/python2.7/hello_world/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM public.ecr.aws/lambda/python:2.7
22

33
COPY app.py requirements.txt ./
44

5-
RUN curl https://bootstrap.pypa.io/2.7/get-pip.py -o get-pip.py
5+
RUN curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
66

77
RUN python2.7 get-pip.py
88

ui-tests/tst/software/aws/toolkits/jetbrains/uitests/fixtures/AwsExplorer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fun IdeaFrame.awsExplorer(
1616
timeout: Duration = Duration.ofSeconds(20),
1717
function: AwsExplorer.() -> Unit
1818
) {
19-
val locator = byXpath("//div[@accessiblename='AWS Explorer Tool Window' and @class='InternalDecorator']")
19+
val locator = byXpath("//div[@accessiblename='AWS Explorer Tool Window']")
2020

2121
step("AWS explorer") {
2222
val explorer = try {
@@ -25,7 +25,7 @@ fun IdeaFrame.awsExplorer(
2525
step("Open tool window") {
2626
// Click the tool window stripe
2727
find(ComponentFixture::class.java, byXpath("//div[@accessiblename='AWS Explorer' and @class='StripeButton' and @text='AWS Explorer']")).click()
28-
find<AwsExplorer>(locator, timeout)
28+
find(locator, timeout)
2929
}
3030
}
3131

0 commit comments

Comments
 (0)