Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat - Extract classes.jar from *.aar #1594

Merged
merged 7 commits into from
Sep 5, 2024
Merged

feat - Extract classes.jar from *.aar #1594

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b155438
Extracting JARs from AARs
Tanish-Ranjan Aug 29, 2024
059cc6d
Addressing Comments
Tanish-Ranjan Aug 29, 2024
4f62651
Addressing comments.
Tanish-Ranjan Aug 30, 2024
9021f77
Made empty Java Home and Gradle Version acceptable for Jvm Build Targets
Tanish-Ranjan Sep 3, 2024
974ebc4
Addressing comments.
Tanish-Ranjan Sep 4, 2024
12900e5
Merge branch 'develop' into feat/android-support
jdneo Sep 5, 2024
4bb27a8
Addressing comments.
Tanish-Ranjan Sep 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...radle.bs.importer/src/com/microsoft/gradle/bs/importer/GradleBuildServerBuildSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,8 @@ private void setProjectJdk(Map<IPath, IClasspathEntry> classpathMap, List<BuildT
javaProject.setOption(JavaCore.COMPILER_COMPLIANCE, targetCompatibility);
}

if (!StringUtils.isEmpty(jvmBuildTarget.getJavaHome())) {
if (!StringUtils.isEmpty(jvmBuildTarget.getJavaHome())
&& !StringUtils.isEmpty(jvmBuildTarget.getGradleVersion())) {
String highestJavaVersion = getHighestCompatibleJavaVersion(jvmBuildTarget.getGradleVersion());
try {
IVMInstall vm = EclipseVmUtil.findOrRegisterStandardVM(
Expand Down Expand Up @@ -589,7 +590,7 @@ private JvmBuildTargetEx getJvmTarget(List<BuildTarget> buildTargets) throws Cor
if (StringUtils.isBlank(jvmTarget.getJavaHome()) || StringUtils.isBlank(jvmTarget.getGradleVersion())) {
JavaLanguageServerPlugin.logException(
new CoreException(new Status(IStatus.WARNING, ImporterPlugin.PLUGIN_ID,
"Invalid JVM build target: Missing JavaHome or GradleVersion."))
"Empty Java Home or Gradle Version in JVM target."))
);
}

Expand Down