addon versioning

2026-02-16 10:30:42 +00:00 · 2021-11-25 09:32:43 -07:00
parent 017a4f8e08
commit f761559e6e
43 changed files with 135 additions and 30 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,22 +2,29 @@ import com.dfsek.terra.configureCompilation
 import com.dfsek.terra.configureDependencies
 import com.dfsek.terra.configureDistribution
 import com.dfsek.terra.configurePublishing
+import com.dfsek.terra.configureVersioning
 import com.dfsek.terra.version
 import com.dfsek.terra.versionProjects
 import com.dfsek.terra.preRelease

+
+preRelease(true)
+
 versionProjects(":common:api", version("6.0.0"))
 versionProjects(":common:implementation", version("6.0.0"))
 versionProjects(":platforms", version("6.0.0"))

-preRelease(true)
-

 allprojects {
    group = "com.dfsek.terra"
    
-    configureDependencies()
+    
+    afterEvaluate {
+        configureVersioning()
+    }
+    
    configureCompilation()
+    configureDependencies()
    configurePublishing()
    
    tasks.withType<JavaCompile>().configureEach {
--- a/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt
+++ b/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt
@@ -13,6 +13,7 @@ import org.gradle.kotlin.dsl.getByName
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
 import org.gradle.language.jvm.tasks.ProcessResources
+import org.apache.tools.ant.filters.ReplaceTokens

 fun Project.configureCompilation() {
    apply(plugin = "maven-publish")
@@ -34,14 +35,13 @@ fun Project.configureCompilation() {
    
    tasks.withType<ProcessResources> {
        include("**/*.*")
-        filter<org.apache.tools.ant.filters.ReplaceTokens>(
+        filter<ReplaceTokens>(
            "tokens" to mapOf(
-                "VERSION" to project.version.toString(),
-                "DESCRIPTION" to project.properties["terra.description"],
-                "WIKI" to project.properties["terra.wiki"],
-                "SOURCE" to project.properties["terra.source"],
-                "ISSUES" to project.properties["terra.issues"],
-                "LICENSE" to project.properties["terra.license"]
+                "DESCRIPTION" to properties["terra.description"],
+                "WIKI" to properties["terra.wiki"],
+                "SOURCE" to properties["terra.source"],
+                "ISSUES" to properties["terra.issues"],
+                "LICENSE" to properties["terra.license"]
                             )
                                                          )
    }
--- a/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt
+++ b/buildSrc/src/main/kotlin/com/dfsek/terra/VersionConfig.kt
@@ -1,6 +1,10 @@
 package com.dfsek.terra

+import org.apache.tools.ant.filters.ReplaceTokens
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.filter
+import org.gradle.kotlin.dsl.withType
+import org.gradle.language.jvm.tasks.ProcessResources

 var isPrerelease = false

@@ -8,7 +12,7 @@ fun preRelease(preRelease: Boolean) {
    isPrerelease = preRelease
 }

-fun Project.versionProjects(project:String, version:String) {
+fun Project.versionProjects(project: String, version: String) {
    project(project).subprojects.forEach {
        it.version = version
    }
@@ -20,3 +24,14 @@ fun Project.version(version: String): String {
    else //Only use git hash if it's a prerelease.
        "$version-BETA+${getGitHash()}"
 }
+
+fun Project.configureVersioning() {
+    tasks.withType<ProcessResources> {
+        include("**/*.*")
+        filter<ReplaceTokens>(
+            "tokens" to mapOf(
+                "VERSION" to version.toString()
+                             )
+                             )
+    }
+}
--- a/common/addons/api-addon-loader/build.gradle.kts
+++ b/common/addons/api-addon-loader/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
 }

--- a/common/addons/biome-provider-image/build.gradle.kts
+++ b/common/addons/biome-provider-image/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/biome-provider-image/src/main/resources/terra.addon.yml
+++ b/common/addons/biome-provider-image/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: biome-provider-image
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.biome.image.ImageBiomeProviderAddon"
 website:
--- a/common/addons/biome-provider-pipeline/build.gradle.kts
+++ b/common/addons/biome-provider-pipeline/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/biome-provider-pipeline/src/main/resources/terra.addon.yml
+++ b/common/addons/biome-provider-pipeline/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: biome-provider-pipeline
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.biome.pipeline.BiomePipelineAddon"
 website:
--- a/common/addons/biome-provider-single/build.gradle.kts
+++ b/common/addons/biome-provider-single/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/biome-provider-single/src/main/resources/terra.addon.yml
+++ b/common/addons/biome-provider-single/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: biome-provider-single
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.biome.single.SingleBiomeProviderAddon"
 website:
--- a/common/addons/chunk-generator-noise-3d/build.gradle.kts
+++ b/common/addons/chunk-generator-noise-3d/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/chunk-generator-noise-3d/src/main/resources/terra.addon.yml
+++ b/common/addons/chunk-generator-noise-3d/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: chunk-generator-noise-3d
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.chunkgenerator.NoiseChunkGenerator3DAddon"
 website:
--- a/common/addons/config-biome/build.gradle.kts
+++ b/common/addons/config-biome/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-biome/src/main/resources/terra.addon.yml
+++ b/common/addons/config-biome/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-biome
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.biome.BiomeAddon"
 website:
--- a/common/addons/config-carver/build.gradle.kts
+++ b/common/addons/config-carver/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-carver/src/main/resources/terra.addon.yml
+++ b/common/addons/config-carver/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-carver
-version: 0.1.0
+version: @VERSION@
 entrypoints: []
 website:
  issues: https://github.com/PolyhedralDev/Terra-config-carver/issues
--- a/common/addons/config-distributors/build.gradle.kts
+++ b/common/addons/config-distributors/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-distributors/src/main/resources/terra.addon.yml
+++ b/common/addons/config-distributors/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-distributors
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.feature.distributor.DistributorAddon"
 website:
--- a/common/addons/config-feature/build.gradle.kts
+++ b/common/addons/config-feature/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-feature/src/main/resources/terra.addon.yml
+++ b/common/addons/config-feature/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-feature
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.feature.FeatureAddon"
 website:
--- a/common/addons/config-flora/build.gradle.kts
+++ b/common/addons/config-flora/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-flora/src/main/resources/terra.addon.yml
+++ b/common/addons/config-flora/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-flora
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.flora.FloraAddon"
 website:
--- a/common/addons/config-locators/build.gradle.kts
+++ b/common/addons/config-locators/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-locators/src/main/resources/terra.addon.yml
+++ b/common/addons/config-locators/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-locators
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.feature.locator.LocatorAddon"
 website:
--- a/common/addons/config-noise-function/build.gradle.kts
+++ b/common/addons/config-noise-function/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-noise-function/src/main/resources/terra.addon.yml
+++ b/common/addons/config-noise-function/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-noise-function
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.noise.NoiseAddon"
 website:
--- a/common/addons/config-ore/build.gradle.kts
+++ b/common/addons/config-ore/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-ore/src/main/resources/terra.addon.yml
+++ b/common/addons/config-ore/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-ore
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.ore.OreAddon"
 website:
--- a/common/addons/config-palette/build.gradle.kts
+++ b/common/addons/config-palette/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/config-palette/src/main/resources/terra.addon.yml
+++ b/common/addons/config-palette/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-palette
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.palette.PaletteAddon"
 website:
--- a/common/addons/config-structure/build.gradle.kts
+++ b/common/addons/config-structure/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi("com.googlecode.json-simple:json-simple:1.1.1")
    shadedApi(project(":common:addons:manifest-addon-loader"))
--- a/common/addons/config-structure/src/main/resources/terra.addon.yml
+++ b/common/addons/config-structure/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: config-structure
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.structure.StructureAddon"
 website:
--- a/common/addons/generation-stage-feature/build.gradle.kts
+++ b/common/addons/generation-stage-feature/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/generation-stage-feature/src/main/resources/terra.addon.yml
+++ b/common/addons/generation-stage-feature/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: generation-stage-feature
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.generation.feature.FeatureGenerationAddon"
 website:
--- a/common/addons/generation-stage-structure/build.gradle.kts
+++ b/common/addons/generation-stage-structure/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi(project(":common:addons:manifest-addon-loader"))
 }
--- a/common/addons/generation-stage-structure/src/main/resources/terra.addon.yml
+++ b/common/addons/generation-stage-structure/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: generation-stage-structure
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.generation.structure.StructureGenerationAddon"
 website:
--- a/common/addons/language-yaml/build.gradle.kts
+++ b/common/addons/language-yaml/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedImplementation("com.dfsek.tectonic:yaml:2.1.2")
    shadedApi(project(":common:addons:manifest-addon-loader"))
--- a/common/addons/language-yaml/src/main/resources/terra.addon.yml
+++ b/common/addons/language-yaml/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: language-yaml
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.yaml.YamlAddon"
 website:
--- a/common/addons/manifest-addon-loader/build.gradle.kts
+++ b/common/addons/manifest-addon-loader/build.gradle.kts
@@ -1,3 +1,7 @@
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+
 dependencies {
    shadedApi("commons-io:commons-io:2.6")
    shadedImplementation("com.dfsek.tectonic:yaml:2.1.2")
--- a/common/addons/structure-sponge-loader/build.gradle.kts
+++ b/common/addons/structure-sponge-loader/build.gradle.kts
@@ -1,4 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.dfsek.terra.version
+
+version = version("0.1.0")

 plugins {
    id("com.github.johnrengelman.shadow")
--- a/common/addons/structure-sponge-loader/src/main/resources/terra.addon.yml
+++ b/common/addons/structure-sponge-loader/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: structure-sponge-loader
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.sponge.SpongeSchematicAddon"
 website:
--- a/common/addons/structure-terrascript-loader/build.gradle.kts
+++ b/common/addons/structure-terrascript-loader/build.gradle.kts
@@ -1,4 +1,8 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import com.dfsek.terra.version
+
+version = version("0.1.0")
+

 plugins {
    id("com.github.johnrengelman.shadow")
--- a/common/addons/structure-terrascript-loader/src/main/resources/terra.addon.yml
+++ b/common/addons/structure-terrascript-loader/src/main/resources/terra.addon.yml
@@ -2,7 +2,7 @@ schema-version: 1
 contributors:
  - Terra contributors
 id: structure-terrascript-loader
-version: 0.1.0
+version: @VERSION@
 entrypoints:
  - "com.dfsek.terra.addons.terrascript.TerraScriptAddon"
 website: