updates

.github/workflows/nightly.yml

@@ -5,13 +5,11 @@ on:
     paths-ignore:
      - 'README.md'
      - 'CHANGELOG.md'
-     - '.github/workflows/nightly.yml'
      - '.github/workflows/macos_pkg.yml'
   pull_request:
     paths-ignore:
      - 'README.md'
      - 'CHANGELOG.md'
-     - '.github/workflows/nightly.yml'
      - '.github/workflows/macos_pkg.yml'
   workflow_dispatch:
     inputs:
@@ -481,6 +479,7 @@ jobs:
                sudo apt-get install imagemagick
                sudo apt-get install xdotool xclip
                sudo apt-get install x11-apps x11-utils
+               sudo apt-get install lwm fvwm
                sudo apt-get install xvfb
 
         - name: download tester
@@ -511,6 +510,8 @@ jobs:
                printf 'sleep 220\n' >> /tmp/a.sh
                printf 'xdotool mousemove --sync 214 295 click 1\n' >> /tmp/a.sh
                printf 'sleep 40\n' >> /tmp/a.sh
+               printf 'fvwm2 &' >> /tmp/a.sh
+               printf 'sleep 20\n' >> /tmp/a.sh
                printf 'import -window root /tmp/screenshot-linux.png\n' >> /tmp/a.sh
                cat /tmp/a.sh
                chmod a+rx /tmp/a.sh

build.gradle.kts

@@ -1,7 +1,6 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
 import org.jetbrains.kotlin.de.undercouch.gradle.tasks.download.Download
 import java.time.format.DateTimeFormatter
-import java.time.format.FormatStyle
 
 plugins {
     kotlin("jvm")
@@ -24,8 +23,18 @@ repositories {
 buildConfig {
     buildConfigField("String", "APP_NAME", "\"${project.name}\"")
     buildConfigField("String", "APP_VERSION", provider { "\"${project.version}\"" })
+    buildConfigField("String", "KOTLIN_VERSION", "\"" + embeddedKotlinVersion + "\"")
+    buildConfigField("String", "PROJECT_VERSION", "\"${project.version}\"")
     try
     {
+        try
+        {
+            buildConfigField("String", "GIT_BRANCH", "\"" + grgit.branch.current().fullName + "\"")
+        }
+        catch (e: Exception)
+        {
+            buildConfigField("String", "GIT_BRANCH", "\"" + "????" + "\"")
+        }
         buildConfigField("String", "GIT_COMMIT_HASH", "\"" + grgit.head().abbreviatedId + "\"")
         buildConfigField("String", "GIT_COMMIT_DATE", "\"" + grgit.head().dateTime.
           format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) + "\"")
@@ -35,6 +44,7 @@ buildConfig {
     }
     catch (e: Exception)
     {
+        buildConfigField("String", "GIT_BRANCH", "\"" + "????" + "\"")
         buildConfigField("String", "GIT_COMMIT_HASH", "\"" + "????" + "\"")
         buildConfigField("String", "GIT_COMMIT_DATE", "\"" + "????" + "\"")
         buildConfigField("String", "GIT_COMMIT_MSG", "\"" + "????" + "\"")

gradle.properties

@@ -6,6 +6,6 @@ org.jetbrains.compose.experimental.uikit.enabled=true
 android.defaults.buildfeatures.buildconfig=true
 # Enable kotlin/native experimental memory model
 kotlin.native.binary.memoryModel=experimental
-compose.version=1.6.0-dev1276
+compose.version=1.6.0-dev1282
 kotlin.version=1.9.20
 multiplatform.version=1.9.20

src/main/kotlin/org/briarproject/briar/desktop/ui/AboutScreen.kt

@@ -112,6 +112,8 @@ private fun GeneralInfo() {
         // add(Entry("Git hash", BuildData.GIT_HASH)) // NON-NLS
         // add(Entry("Commit time", DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss").format(commitTime))) // NON-NLS
         add(Entry(i18n("about.version"), BuildConfig.APP_VERSION))
+        add(Entry(i18n("about.git_kotlin_version"), BuildConfig.KOTLIN_VERSION))
+        add(Entry(i18n("about.git_commit_branch"), BuildConfig.GIT_BRANCH))
         add(Entry(i18n("about.git_commit_hash"), BuildConfig.GIT_COMMIT_HASH))
         add(Entry(i18n("about.git_commit_date"), BuildConfig.GIT_COMMIT_DATE))
         add(Entry(i18n("about.git_commit_msg"), BuildConfig.GIT_COMMIT_MSG))