Skip to content

Commit 73014a4

Browse files
authored
Fix .tool-versions and release verifyPlugin (#3630)
1 parent b3af046 commit 73014a4

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: ./gradlew --stacktrace releaseQuoter
3636
- name: Test with Gradle
3737
run: ./gradlew --stacktrace test
38-
runPluginVerifier:
38+
verifyPlugin:
3939
runs-on: ubuntu-latest
4040

4141
steps:
@@ -48,9 +48,9 @@ jobs:
4848
- name: Grant execute permission for gradlew
4949
run: chmod +x gradlew
5050
- name: Run Plugin Verifier
51-
run: ./gradlew --stacktrace runPluginVerifier
51+
run: ./gradlew --stacktrace verifyPlugin
5252
release:
53-
needs: [ test, runPluginVerifier ]
53+
needs: [ test, verifyPlugin ]
5454
runs-on: ubuntu-latest
5555

5656
steps:

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: ./gradlew --stacktrace releaseQuoter
4343
- name: Test with Gradle
4444
run: ./gradlew --stacktrace test
45-
runPluginVerifier:
45+
verifyPlugin:
4646
runs-on: ubuntu-latest
4747

4848
steps:

.tool-versions

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
elixir 1.13.4-otp-24
22
erlang 24.3.4.6
33

4-
# 17.0.12+7 / Azul Zulu: 17.52.17
5-
# GitHub actions uses JBR 17
4+
# 21.0.4+7 / Azul Zulu: 21.36.17
5+
# GitHub actions uses JBR 21
66
# If using mise, you can change below to use JBR as well by doing (if version is 17.xxx)
7-
# mise link java@jbrsdk_jcef-17.0.11-b1312.2-2024.2 /path/to/jbrsdk_jcef-17.0.11-xxx-xxx-b1207.24/Contents/Home
8-
# Then setting it to `java jbrsdk_jcef-17.0.11-b1312.2-2024.2`
9-
java zulu-17.52.17
7+
# mac:
8+
# mise link java@jbrsdk_jcef-21.0.3-b509.4-2024.2 /path/to/jbrsdk_jcef-21.0.3-xxx-xxx-b509.4/Contents/Home
9+
# Then setting it to `java jbrsdk_jcef-21.0.3-b509.4-2024.2`
10+
java zulu-21.36.17

src/org/elixir_lang/sdk/elixir/Type.kt

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -531,23 +531,21 @@ ELIXIR_SDK_HOME
531531
return if (!project.isDisposed) {
532532
/* ModuleUtilCore.findModuleForPsiElement can fail with NullPointerException if the
533533
ProjectFileIndex.SERVICE.getInstance(Project) returns {@code null}, so check that the
534-
ProjectFileIndex is available first
535-
*/
534+
ProjectFileIndex is available first */
536535
if (ProjectFileIndex.SERVICE.getInstance(project) != null) {
537-
ApplicationManager.getApplication().executeOnPooledThread(Callable {
538-
ReadAction.compute<Sdk?, Throwable> {
539-
try {
540-
val module = ModuleUtilCore.findModuleForPsiElement(psiElement)
541-
if (module != null) {
542-
mostSpecificSdk(module)
543-
} else {
544-
mostSpecificSdk(project)
545-
}
546-
} catch (_: AlreadyDisposedException) {
547-
null
548-
}
536+
val module = try {
537+
ReadAction.compute<Module, Throwable> {
538+
ModuleUtilCore.findModuleForPsiElement(psiElement)
549539
}
550-
}).get()
540+
} catch (_: AlreadyDisposedException) {
541+
null
542+
}
543+
544+
if (module != null) {
545+
mostSpecificSdk(module)
546+
} else {
547+
mostSpecificSdk(project)
548+
}
551549
} else {
552550
mostSpecificSdk(project)
553551
}

0 commit comments

Comments
 (0)