Use own version for catalogs

metaborg · Jul 13, 2024 · 096a185 · 096a185
1 parent 3b07796
commit 096a185
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/convention-plugin/build.gradle.kts b/convention-plugin/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     `maven-publish`
 //    signing
     // We don't use the version catalog here, to avoid a bootstrapping problem.
-    id("org.metaborg.gitonium") version "1.4.0"
+    id("org.metaborg.gitonium") version "1.4.1"
 }
 
 group = "org.metaborg"

diff --git a/convention-plugin/src/main/kotlin/org/metaborg/convention/BuildInfo.kt b/convention-plugin/src/main/kotlin/org/metaborg/convention/BuildInfo.kt
@@ -17,8 +17,10 @@ object BuildInfo {
         }
     }
 
-    /** The library version. */
+    /** The current version. */
     val version: String get() = checkNotNull(properties.getProperty("version"))
+    /** The most recent release version. */
+    val releaseVersion: String get() = checkNotNull(properties.getProperty("release-version"))
     /** The commit ID. */
     val commit: String get() = checkNotNull(properties.getProperty("short-revision"))
 

diff --git a/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionExtension.kt b/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionExtension.kt
@@ -1,12 +1,13 @@
 package org.metaborg.convention
 
+import org.gradle.api.provider.Property
+
 /** Configuration for the settings build convention. */
 interface SettingsConventionExtension {
 
     /**
      * Sets the convention (default values) for the configuration extension.
      */
     fun setConvention() {
-
     }
 }
diff --git a/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionPlugin.kt b/convention-plugin/src/main/kotlin/org/metaborg/convention/SettingsConventionPlugin.kt
@@ -17,7 +17,7 @@ import org.gradle.kotlin.dsl.maven
 class SettingsConventionPlugin: Plugin<Settings> {
 
     // Version of org.metaborg.spoofax3:catalog to be used for Metaborg projects
-    private val catalogVersion = "0.5.1"
+    private val catalogVersion = BuildInfo.releaseVersion
 
     @Suppress("UnstableApiUsage")
     override fun apply(settings: Settings): Unit = with(settings) {
@@ -39,7 +39,7 @@ class SettingsConventionPlugin: Plugin<Settings> {
             }
             versionCatalogs {
                 create("libs") {
-                    from("org.metaborg.spoofax3:catalog:$catalogVersion")
+                    from("org.metaborg:catalog:$catalogVersion")
                 }
             }
         }