Skip to content

Update AndroidGradleModuleUtils.kt #27

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update AndroidGradleModuleUtils.kt #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 4 additions & 7 deletions android-npw/src/com/android/tools/idea/npw/project/AndroidGradleModuleUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,9 @@ fun NamedModuleTemplate.getSourceProvider() = SourceProviderAdapter(name, paths)
* If the file is not contained by any project then return null
*/
fun getContainingModule(file: File?, project: Project): Module? {
if (project.isDisposed) return null
val vFile = VfsUtil.findFileByIoFile(file!!, false)
return if (vFile == null || vFile.isDirectory)
null
else
ProjectFileIndex.getInstance(project).getModuleForFile(vFile, false)
if (project.isDisposed || file == null) return null
val vFile = VfsUtil.findFileByIoFile(file, false) ?: return null
return if (vFile.isDirectory) null else ProjectFileIndex.getInstance(project).getModuleForFile(vFile, false)
}

/**
Expand Down Expand Up @@ -88,4 +85,4 @@ fun determineVersionCatalogUse(project: Project): Boolean {
}

// TODO(b/322863175): Establish process/tests to ensure the default version gets updated.
const val DEFAULT_KOTLIN_VERSION_FOR_NEW_PROJECTS = "1.9.24"
const val DEFAULT_KOTLIN_VERSION_FOR_NEW_PROJECTS = "1.9.24"