Use metaborg-git

metaborg · Jul 24, 2024 · 48b98bd · 48b98bd
1 parent fb992a0
commit 48b98bd
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 1,047 deletions.
diff --git a/example/settings.gradle.kts b/example/settings.gradle.kts
@@ -1,3 +1,17 @@
+dependencyResolutionManagement {
+    repositories {
+        maven("https://artifacts.metaborg.org/content/groups/public/")
+        mavenCentral()
+    }
+}
+
+pluginManagement {
+    repositories {
+        maven("https://artifacts.metaborg.org/content/groups/public/")
+        gradlePluginPortal()
+    }
+}
+
 rootProject.name = "gitonium-example-project"
 
 includeBuild("../plugin/")

diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -14,10 +14,14 @@ plugins {
 description = "A Git-based versioning plugin for Gradle."
 
 dependencies {
-    testImplementation  (libs.kotest)
-    testImplementation  (libs.kotest.assertions)
-    testImplementation  (libs.kotest.datatest)
-    testImplementation  (libs.kotest.property)
+    implementation(platform(libs.metaborg.platform))
+
+    implementation(libs.metaborg.git)
+    implementation(testFixtures(libs.metaborg.git))
+    testImplementation(libs.kotest)
+    testImplementation(libs.kotest.assertions)
+    testImplementation(libs.kotest.datatest)
+    testImplementation(libs.kotest.property)
 }
 
 gradlePlugin {

diff --git a/plugin/src/main/kotlin/mb/gitonium/CommandUtils.kt b/plugin/src/main/kotlin/mb/gitonium/CommandUtils.kt
@@ -1,6 +1,6 @@
 package mb.gitonium
 
-import mb.gitonium.git.CommandException
+import org.metaborg.git.CommandException
 import java.io.File
 import java.io.IOException
 import kotlin.jvm.Throws

diff --git a/plugin/src/main/kotlin/mb/gitonium/GitoniumVersion.kt b/plugin/src/main/kotlin/mb/gitonium/GitoniumVersion.kt
@@ -1,9 +1,9 @@
 package mb.gitonium
 
-import mb.gitonium.git.CommandException
-import mb.gitonium.git.GitRepo
-import mb.gitonium.git.NativeGitRepo
 import org.gradle.api.Project
+import org.metaborg.git.CommandException
+import org.metaborg.git.GitRepo
+import org.metaborg.git.NativeGit
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File
@@ -130,16 +130,16 @@ data class GitoniumVersion(
          * @throws IOException If an I/O error occurs, or if Git is not available.
          */
         private fun getGitRepo(repoDirectory: File): GitRepo? {
-            val repo = NativeGitRepo(repoDirectory)
-
             // Ensure Git is available
+            val git = NativeGit()
             try {
-                repo.getGitVersion() ?: throw IOException("Git is not available.")
+                git.getGitVersion() ?: throw IOException("Git is not available.")
             } catch (e: IOException) {
                 throw IOException("Git is not available.", e)
             }
 
             // Ensure the directory exists and is a Git repository
+            val repo = git.open(repoDirectory)
             try {
                 repo.getStatus()
             } catch (e: CommandException) {

diff --git a/plugin/src/main/kotlin/mb/gitonium/git/CommandException.kt b/plugin/src/main/kotlin/mb/gitonium/git/CommandException.kt
diff --git a/plugin/src/main/kotlin/mb/gitonium/git/GitRepo.kt b/plugin/src/main/kotlin/mb/gitonium/git/GitRepo.kt
diff --git a/plugin/src/main/kotlin/mb/gitonium/git/NativeGitRepo.kt b/plugin/src/main/kotlin/mb/gitonium/git/NativeGitRepo.kt