Add versioning (WIP)

Don't upload the artifact; uploading to flathub
will probably need a different approach.

.gitea/workflows/flatpak.yaml

@@ -0,0 +1,35 @@
+on:
+  push:
+    # TODO: remove versioning branch once everything works
+    branches: [main,versioning]
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+name: Flatpak
+jobs:
+  flatpak:
+    name: Flatpak
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
+      options: --privileged
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle
+          restore-keys: ${{ runner.os }}-gradle
+      - name: Build Release Uber JAR
+        run: ./gradlew packageReleaseUberJarForCurrentOS
+      - uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+        with:
+          bundle: YAEP.flatpak
+          manifest-path: ./flatpak/ch.dissem.YAEP.yml
+          cache-key: flatpak-builder-${{ github.sha }}
+          upload-artifact: false

CHANGELOG.md

@@ -0,0 +1,26 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+
+- Yet Another Einstein Puzzle, for Desktop and not-quite-yet Android
+
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+
+[unreleased]: https://git.dissem.ch/chris/YAEP/compare/1b9c8633c96e479e63afcd7301125ce67247a198...HEAD
+[0.0.0]: https://git.dissem.ch/chris/YAEP/releases/tag/0.0.0

build.gradle.kts

@@ -8,6 +8,7 @@ plugins {
     alias(libs.plugins.versions)
     alias(libs.plugins.sonarqube)
     alias(libs.plugins.kotlin.kover)
+    alias(libs.plugins.versioning)
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.compose) apply false
@@ -17,6 +18,24 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
 }
 
+version = "0.0.0-SNAPSHOT"
+gitVersioning.apply {
+    refs {
+        branch(".+") {
+            considerTagsOnBranches = true
+            version = "\${ref}-SNAPSHOT"
+        }
+        tag("(?<version>.*)") {
+            version = "\${ref.version}"
+        }
+    }
+
+    // optional fallback configuration in case of no matching ref configuration
+    rev {
+        version = "\${commit}"
+    }
+}
+
 sonar {
     properties {
         property("sonar.projectKey", "YAEP")

desktop/build.gradle.kts

@@ -1,4 +1,6 @@
-import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Deb
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Dmg
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Msi
 
 plugins {
     alias(libs.plugins.kotlin.kover)
@@ -29,18 +31,31 @@ compose.desktop {
         mainClass = "ch.dissem.yaep.ui.desktop.MainKt"
 
         nativeDistributions {
-            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            val formats = mutableListOf(Deb)
             packageName = "YAEP"
-            packageVersion = libs.versions.app.version.name.get()
+            val baseVersion = version.toString()
+            packageVersion = baseVersion
+            if (baseVersion.matches(Regex("[1-9][0-9]*(\\.[0-9]+)(\\.[0-9]+)"))) {
+                formats.add(Dmg)
                 macOS {
                     iconFile.set(project.file("icon.icns"))
                 }
+            }
+            if (baseVersion.matches(Regex("[1-2]?[0-9]?[0-9]\\.[1-2]?[0-9]?[0-9]\\.[1-6]?[0-9]?[0-9]?[0-9]?[0-9]"))) {
                 windows {
+                    formats.add(Msi)
                     iconFile.set(project.file("icon.ico"))
                 }
+            }
             linux {
+                debPackageVersion = if (baseVersion.first().isDigit()) {
+                    baseVersion
+                } else {
+                    "0-$baseVersion"
+                }
                 iconFile.set(project.file("icon.png"))
             }
+            targetFormats(*formats.toTypedArray())
 
             buildTypes.release.proguard {
                 configurationFiles.from(project.file("proguard-rules.pro"))

flatpak/info/ch.dissem.YAEP.metainfo.xml

@@ -81,7 +81,7 @@
     <url type="vcs-browser">https://git.dissem.ch/chris/YAEP</url>
 
     <releases>
-        <release date="2025-11-29" version="1.0.0">
+        <release date="2025-11-29" version="0.0.0">
             <description>
                 <ul>
                     <li>Initial release</li>

gradle/libs.versions.toml

@@ -1,14 +1,14 @@
 [versions]
 app-version-code = "1"
 app-version-name = "1.0.0"
-agp = "8.13.1"
+agp = "8.13.0"
 jdk = "21"
 android-compileSdk = "36"
 android-minSdk = "26"
 android-targetSdk = "36"
 androidx-activityCompose = "1.11.0"
 androidx-compose = "1.9.4"
-compose-plugin = "1.9.3"
+compose-plugin = "1.9.2"
 kotlin = "2.2.21"
 coreKtx = "1.17.0"
 atrium = "1.2.0"
@@ -33,6 +33,7 @@ logging-slf4j = { module = "org.slf4j:slf4j-simple", version = "2.0.17" }
 logging = ["logging-jvm", "logging-slf4j"]
 
 [plugins]
+versioning = { id = "me.qoomon.git-versioning", version = "6.4.4"}
 versions = { id = "com.github.ben-manes.versions", version = "0.53.0" }
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }