Skip to content

Commit 2aa7f6f

Browse files
fix: Configure patches project on extensions projects absence (#5)
1 parent 21b29d8 commit 2aa7f6f

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

src/main/kotlin/app/revanced/patches/gradle/SettingsPlugin.kt

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@ abstract class SettingsPlugin @Inject constructor(
5555
private fun Settings.configureProjects(extension: SettingsExtension) {
5656
// region Include the projects
5757

58-
val extensionsProjectPath = extension.extensions.projectsPath ?: return
58+
val extensionsProjectPath = extension.extensions.projectsPath
5959

60-
objectFactory.fileTree().from(rootDir.resolve(extensionsProjectPath)).matching {
61-
it.include("**/build.gradle.kts")
62-
}.forEach {
63-
include(it.relativeTo(rootDir).toPath().joinToString(":"))
60+
if (extensionsProjectPath != null) {
61+
objectFactory.fileTree().from(rootDir.resolve(extensionsProjectPath)).matching {
62+
it.include("**/build.gradle.kts")
63+
}.forEach {
64+
include(it.relativeTo(rootDir).toPath().joinToString(":"))
65+
}
6466
}
6567

6668
include(extension.patchesProjectPath)
@@ -70,18 +72,20 @@ abstract class SettingsPlugin @Inject constructor(
7072
// region Apply the plugins
7173

7274
gradle.rootProject { rootProject ->
73-
val extensionsProject = try {
74-
rootProject.project(extensionsProjectPath)
75-
} catch (e: UnknownProjectException) {
76-
return@rootProject
77-
}
75+
if (extensionsProjectPath != null) {
76+
val extensionsProject = try {
77+
rootProject.project(extensionsProjectPath)
78+
} catch (e: UnknownProjectException) {
79+
null
80+
}
7881

79-
extensionsProject.subprojects { extensionProject ->
80-
if (
81-
extensionProject.buildFile.exists() &&
82-
!extensionProject.parent!!.plugins.hasPlugin(ExtensionPlugin::class.java)
83-
) {
84-
extensionProject.pluginManager.apply(ExtensionPlugin::class.java)
82+
extensionsProject?.subprojects { extensionProject ->
83+
if (
84+
extensionProject.buildFile.exists() &&
85+
!extensionProject.parent!!.plugins.hasPlugin(ExtensionPlugin::class.java)
86+
) {
87+
extensionProject.pluginManager.apply(ExtensionPlugin::class.java)
88+
}
8589
}
8690
}
8791

0 commit comments

Comments
 (0)