From 513107b56a2ce32665033960c89ae2aba15a4894 Mon Sep 17 00:00:00 2001
From: Adam <897017+asemy@users.noreply.github.com>
Date: Mon, 25 Oct 2021 23:34:38 +0200
Subject: [PATCH] whoa... version bump 0.0.3 (and automatically replace this in
 the mod.zip using tokens)

---
 build.gradle.kts                                |  2 +-
 .../factoriowebmap/archetype/base.gradle.kts    |  9 +++++++++
 modules/mod/build.gradle.kts                    | 17 +++++++++++++++--
 .../mod/src/main/resources/mod-data/info.json   |  2 +-
 modules/mod/src/main/typescript/package.json    |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index c85d539..182dc1f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "dev.adamko.factoriowebmap"
-version = "0.0.2"
+version = "0.0.3"
 
 tasks.wrapper {
   gradleVersion = "7.2"
diff --git a/buildSrc/src/main/kotlin/dev/adamko/factoriowebmap/archetype/base.gradle.kts b/buildSrc/src/main/kotlin/dev/adamko/factoriowebmap/archetype/base.gradle.kts
index 35f58dc..114b6a7 100644
--- a/buildSrc/src/main/kotlin/dev/adamko/factoriowebmap/archetype/base.gradle.kts
+++ b/buildSrc/src/main/kotlin/dev/adamko/factoriowebmap/archetype/base.gradle.kts
@@ -10,6 +10,15 @@ version = rootProject.version
 val projectId by extra("fwm-${project.name}")
 //val modBuildDir by extra(layout.buildDirectory.dir(projectId).get())
 
+val licenseFile: RegularFile by extra(rootProject.layout.projectDirectory.file("LICENSE"))
+
+val tokens: Map<String, String> by extra(
+  mapOf(
+    "project.version" to "$version",
+  )
+)
+
+
 //group = "dev.adamko.factoriowebmap"
 //version = "0.0.1"
 
diff --git a/modules/mod/build.gradle.kts b/modules/mod/build.gradle.kts
index 7a1002d..16c5f5e 100644
--- a/modules/mod/build.gradle.kts
+++ b/modules/mod/build.gradle.kts
@@ -1,11 +1,13 @@
 import com.github.gradle.node.npm.task.NpmTask
 import org.jetbrains.kotlin.util.parseSpaceSeparatedArgs
+import org.apache.tools.ant.filters.ReplaceTokens
 
 plugins {
   id("dev.adamko.factoriowebmap.archetype.node")
 }
 
 val projectId: String by project.extra
+val tokens: Map<String, String> by project.extra
 
 val tsSrcDir: Directory = layout.projectDirectory.dir("src/main/typescript")
 val modBuildDir: Directory = layout.buildDirectory.dir(projectId).get()
@@ -71,8 +73,13 @@ val modPackageTask = tasks.register<Zip>("packageMod") {
 
   dependsOn(tstlTask)
 
+  inputs.properties(tokens)
+
+  from(layout.projectDirectory.dir("src/main/resources/mod-data")) {
+    include("**/**")
+    filter<ReplaceTokens>("tokens" to tokens)
+  }
   from(
-    layout.projectDirectory.dir("src/main/resources/mod-data"),
     rootProject.layout.projectDirectory.file("LICENSE"),
     tstlTask,
   )
@@ -82,8 +89,14 @@ val modPackageTask = tasks.register<Zip>("packageMod") {
   // Factorio required format is:
   // - filename: `mod-name_version.zip`
   // - zip contains one directory, `mod-name`
-  archiveFileName.set("${rootProject.name}_${rootProject.version}.zip")
+  archiveFileName.set("${rootProject.name}_${project.version}.zip")
   destinationDirectory.set(modBuildDir.dir("dist"))
+
+  doLast {
+    val outDir = destinationDirectory.asFile.get().toRelativeString(layout.projectDirectory.asFile)
+    val outZip = "${archiveFileName.orNull}"
+    logger.lifecycle("Creating mod zip $outDir/$outZip")
+  }
 }
 
 //tasks.build { dependsOn(tstlTask, modPackageTask) }
diff --git a/modules/mod/src/main/resources/mod-data/info.json b/modules/mod/src/main/resources/mod-data/info.json
index edb1777..538c892 100644
--- a/modules/mod/src/main/resources/mod-data/info.json
+++ b/modules/mod/src/main/resources/mod-data/info.json
@@ -1,6 +1,6 @@
 {
   "name": "factorio-web-map",
-  "version": "0.0.2",
+  "version": "@project.version@",
   "title": "Factorio Web Map",
   "author": "fredthedeadhead",
   "factorio_version": "1.1",
diff --git a/modules/mod/src/main/typescript/package.json b/modules/mod/src/main/typescript/package.json
index d6f6e1b..a663276 100644
--- a/modules/mod/src/main/typescript/package.json
+++ b/modules/mod/src/main/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "factorio-web-map-mod",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "private": true,
   "scripts": {
     "build": "tstl",