Skip to content

Commit

Permalink
#575 | Improved detection of the Gradle modules
Browse files Browse the repository at this point in the history
  • Loading branch information
mlytvyn authored Aug 14, 2023
1 parent 2b6cb08 commit a674775
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
- Fixed Compact Middle Packages in the Project View [#568](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/568)
- Fixed `commonweb` sources attaching [#572](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/572), [#573](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/573)
- Added `hmc` sub-module dependency on `hmc.web` [#574](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/574)
- Improved detection of the Gradle modules [#575](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/575)

### Other
- Adjusted inline documentation for Type System [#539](https://github.com/epam/sap-commerce-intellij-idea-plugin/pull/539)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* This file is part of "hybris integration" plugin for Intellij IDEA.
* This file is part of "SAP Commerce Developers Toolset" plugin for Intellij IDEA.
* Copyright (C) 2014-2016 Alexander Bartash <[email protected]>
* Copyright (C) 2019-2023 EPAM Systems <[email protected]> and contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
Expand Down Expand Up @@ -130,7 +131,8 @@ public boolean isGradleModule(final File file) {
if (file.getAbsolutePath().contains(HybrisConstants.PLATFORM_MODULE_PREFIX)) {
return false;
}
return new File(file, HybrisConstants.GRADLE_SETTINGS).isFile();
return new File(file, HybrisConstants.GRADLE_SETTINGS).isFile()
|| new File(file, HybrisConstants.GRADLE_BUILD).isFile();
}

@Override
Expand All @@ -139,7 +141,8 @@ public boolean isGradleKtsModule(final File file) {
if (file.getAbsolutePath().contains(HybrisConstants.PLATFORM_MODULE_PREFIX)) {
return false;
}
return new File(file, HybrisConstants.GRADLE_SETTINGS_KTS).isFile();
return new File(file, HybrisConstants.GRADLE_SETTINGS_KTS).isFile()
|| new File(file, HybrisConstants.GRADLE_BUILD_KTS).isFile();
}

@Override
Expand Down

0 comments on commit a674775

Please sign in to comment.