Fix parsing classpath for Bumblebee, Chipmunk and Dolphin on Linux and Windows #442
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
asodja
force-pushed
the
asodja/android-studio-bumblebee-chipmunk
branch
from
c0f2ec1
to
47f496c
Compare
lptr
reviewed
Aug 22, 2022
| @@ -41,16 +41,19 @@ some other text | |||
| studioInstallDir.toPath().resolve("lib/lib2.jar"), | |||
| studioInstallDir.toPath().resolve("lib/lib1/lib1.jar") | |||
| ] | |||
|
|
|||
| where: | |||
| classpathKeyword << ["CLASS_PATH", "CLASSPATH"] | |||
There was a problem hiding this comment.
Let's document somewhere which keyword belongs to the old vs. new versions.
There was a problem hiding this comment.
Good idea, added a comment.
asodja
changed the title
lptr
reviewed
Aug 22, 2022
| * Android Studio Dolphin (2021.3) and older versions use "CLASSPATH", while Electric Eel (2022.1) and newer versions use CLASS_PATH | ||
| */ | ||
| private static final Pattern LINUX_CLASSPATH_LIB_PATTERN = Pattern.compile(".*(CLASS_PATH|CLASSPATH)=.*(?<lib>lib/.+\\.jar).*"); | ||
| private static final Pattern WINDOWS_CLASSPATH_LIB_PATTERN = Pattern.compile(".*(CLASS_PATH|CLASSPATH)=.*(?<lib>lib\\\\.+\\.jar).*"); |
There was a problem hiding this comment.
Nit: instead of (CLASS_PATH|CLASSPATH) you could use (?:CLASS_PATH|CLASSPATH) to make it obvious that this group is not captured.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
If this will be still require adjustments with new versions in the future, we could run
start.shorstart.batdirectly, but we would need to check what env. variables we need to set for custom AS args.We don't have AS multi version tests, but I ran a tests with Bumblebee and all pass, here is the build:
https://builds.gradle.org/buildConfiguration/GradleProfiler_GradleProfilerTestTrigger/55190392?buildTab=overview&hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildChangesSection=true