diff --git a/CHANGELOG.md b/CHANGELOG.md index 92892644..241cf936 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ ### Removed +- unnecessary call to `Git` in `GitCache` + ### Updated - `com.javiersc.hubdle:com.javiersc.hubdle.gradle.plugin -> 0.7.6` diff --git a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/git/GitCache.kt b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/git/GitCache.kt index f76c5c88..8a5ee344 100644 --- a/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/git/GitCache.kt +++ b/semver-project-gradle-plugin/main/kotlin/com/javiersc/semver/project/gradle/plugin/internal/git/GitCache.kt @@ -1,6 +1,8 @@ package com.javiersc.semver.project.gradle.plugin.internal.git import com.javiersc.gradle.version.GradleVersion +import com.javiersc.semver.project.gradle.plugin.Commit +import com.javiersc.semver.project.gradle.plugin.Tag import com.javiersc.semver.project.gradle.plugin.internal.InitialVersion import com.javiersc.semver.project.gradle.plugin.internal.semverWarningMessage import com.javiersc.semver.project.gradle.plugin.internal.warningLastVersionIsNotHigherVersion @@ -37,7 +39,7 @@ private constructor( } } - internal val gitFiles: List = git.repository.directory.walkTopDown().toList() + // internal val gitFiles: List = git.repository.directory.walkTopDown().toList() internal val isClean: Boolean get() = git.status().call().isClean @@ -52,7 +54,8 @@ private constructor( message = headRevCommit.shortMessage, fullMessage = headRevCommit.fullMessage, hash = headRevCommit.toObjectId().name, - )) + ), + ) } internal val commitsInCurrentBranchRevCommit: List by lazy { @@ -64,20 +67,19 @@ private constructor( commitsInCurrentBranchRevCommit.map(RevCommit::getName) } - internal val commitsInTheCurrentBranchPublicApi: - List by lazy { + internal val commitsInTheCurrentBranchPublicApi: List by lazy { commitsInCurrentBranchRevCommit.map { revCommit -> val hash: String = revCommit.toObjectId().name - val tags: List = + val tags: List = tagsInCurrentBranchRef .filter { ref -> commitHash(ref) == hash } .map { ref -> - com.javiersc.semver.project.gradle.plugin.Tag( + Tag( name = ref.tagName, refName = ref.name, ) } - com.javiersc.semver.project.gradle.plugin.Commit( + Commit( message = revCommit.shortMessage, fullMessage = revCommit.fullMessage, hash = hash, @@ -120,7 +122,7 @@ private constructor( internal val tagsInCurrentBranch: List get() = tagsInCurrentBranchRef.map { ref -> - val commit = git.repository.parseCommit(ref.objectId) + val commit: RevCommit = git.repository.parseCommit(ref.objectId) GitRef.Tag( name = ref.tagName, refName = ref.name, @@ -195,8 +197,8 @@ private constructor( } ?: InitialVersion - internal fun shouldRefresh(): Boolean = - git.repository.directory.walkTopDown().toList() != gitFiles + // internal fun shouldRefresh(): Boolean = + // git.repository.directory.walkTopDown().toList() != gitFiles private fun List.lastResultVersion(tagPrefix: String): GradleVersion? = asSequence()