@@ -14,12 +14,15 @@ import org.gradle.api.tasks.Internal
1414
1515
1616abstract class GitSemverPluginExtension (project : Project , providerFactory : ProviderFactory ) : BaseSettings() {
17+ init {
18+ gitDirectory.convention(project.layout.projectDirectory)
19+ }
20+
1721 private val defaultPreReleaseProperty = project.findProperty(" defaultPreRelease" )
1822 private val noDirtyCheckProperty = project.findProperty(" noDirtyCheck" )
19- private val projectDir = project.layout.projectDirectory;
2023
2124 /* *
22- * Directory where to find the git project. If the git directory is a parent of this directory it will be found.
25+ * Directory where to find the git project. If the git directory is a parent of this directory, it will be found.
2326 * Default: project dir.
2427 */
2528 abstract val gitDirectory: DirectoryProperty
@@ -113,22 +116,18 @@ abstract class GitSemverPluginExtension(project: Project, providerFactory: Provi
113116 val version: String by lazy { versionValue.toString() }
114117
115118 private var semInfoVersionValueSource = project.providers.of(SemInfoVersionValueSource ::class .java) {
116- it.parameters.getGitDir().set(gitDir );
119+ it.parameters.getGitDir().set(gitDirectory );
117120 it.parameters.getSettings().set(providerFactory.provider {
118121 createSettings()
119122 })
120123 }
121124 private var semVersionValueSource = project.providers.of(SemVersionValueSource ::class .java) {
122- it.parameters.getGitDir().set(gitDir );
125+ it.parameters.getGitDir().set(gitDirectory );
123126 it.parameters.getSettings().set(providerFactory.provider {
124127 createSettings()
125128 })
126129 }
127130
128- @get:Internal
129- internal val gitDir: Provider <Directory >
130- get() = gitDirectory.orElse(projectDir)
131-
132131 internal fun createSettings (): SemverSettings {
133132 return SemverSettings (this ).apply {
134133 if (defaultPreReleaseProperty is String ) {
0 commit comments