Merge pull request #175 from Murmele/release1.1.1

change version to 1.1.1

.github/workflows/build.yml

@@ -274,6 +274,9 @@ jobs:
       - name: Validate appdata file
         if: matrix.env.ninja_platform == 'linux' && !matrix.qt.check_only
         run: |
+          echo "Show generated appdata file"
+          cat ./build/release/rsrc/linux/com.github.Murmele.Gittyup.appdata.xml
+          echo "Start validating appdata file"
           sudo apt install flatpak
           sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
           sudo flatpak install -y org.freedesktop.appstream-glib

CMakeLists.txt

@@ -5,7 +5,7 @@ project(Gittyup)
 set(GITTYUP_NAME "Gittyup")
 set(GITTYUP_VERSION_MAJOR 1)
 set(GITTYUP_VERSION_MINOR 1)
-set(GITTYUP_VERSION_PATCH 0)
+set(GITTYUP_VERSION_PATCH 1)
 set(GITTYUP_VERSION
     "${GITTYUP_VERSION_MAJOR}.${GITTYUP_VERSION_MINOR}.${GITTYUP_VERSION_PATCH}"
 )

cmake/generate_appdata.cmake

@@ -1,6 +1,9 @@
 # add release notes to the appdata file
 file(READ "${CHANGELOG_HTML}" HTML_CHANGELOGS)
-string(REGEX REPLACE "<h4>([A-Fa-f0-9]*)<\\/h4>" "\\1" RELEASES ${HTML_CHANGELOGS}) # h4 is unknow to appdata
+# it is not allowed to have multiple texts without being in an environment
+# So the description will be used for it
+string(REGEX REPLACE "<p>([^<]*)<\\/p>" "\\1" RELEASES ${HTML_CHANGELOGS}) # remove paragraph environment
+string(REGEX REPLACE "<h4>([A-Za-z0-9]*)<\\/h4>" "<p>\\1</p>" RELEASES ${RELEASES}) # h4 is unknow to appdata so change it to a paragraph environment
 string(REPLACE "\n" "\n\t" RELEASES ${RELEASES}) # add tabulator
 string(REGEX REPLACE "<h3>(v[1-9]\\.[0-9]\\.[0-9]) - ([0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9])<\\/h3>" "<release version='\\1' date='\\2'>\n\t<description>" RELEASES ${RELEASES})
 string(REGEX REPLACE "<hr \\/>" "</description>\n\t</release>" RELEASES ${RELEASES})

docs/changelog.md

@@ -1,3 +1,22 @@
+### v1.1.1 - 2022-06-09
+
+Bug fix release
+
+#### Added
+* Distinguish between commit author and committer
+* Show image preview also for deleted files
+* Official macOS X release
+
+#### Changed
+* Fix single line staging if not all hunks are loaded
+* Fix cherrypick commit author
+* Fix segmentation fault if submodule update fails
+* Fix line staging with windows new lines
+* Show first change in the diff view when loading
+* Improved windows icon
+
+----
+
 ### v1.1.0 - 2022-04-30
 
 Second release of Gittyup

rsrc/linux/com.github.Murmele.Gittyup.appdata.xml.in

@@ -5,6 +5,7 @@
   <project_license>MIT</project_license>
   <name>Gittyup</name>
   <summary>Graphical Git client designed to help you understand and manage your source code history</summary>
+  <developer_name>Gittyup Community</developer_name>
 
   <description>
     <p>Graphical Git client designed to help you understand and manage your source code history</p>