Merge pull request #638 from tkashkin/master

tkashkin · May 24, 2022 · b2e73b5 · b2e73b5
2 parents 550226e + 9327885
commit b2e73b5
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 21 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,12 +1,12 @@
-version: 0.16.2-{build}-{branch}
+version: 0.16.3-{build}-{branch}
 
 pull_requests:
   do_not_increment_build_number: true
 
 skip_tags: true
 
 image:
-  - Ubuntu1804
+  - Ubuntu
 
 clone_folder: ~/build/GameHub
 

diff --git a/data/com.github.tkashkin.gamehub.changelog.xml b/data/com.github.tkashkin.gamehub.changelog.xml
@@ -1,7 +1,7 @@
-<release type="stable" version="0.16.1" date="2021-09-01" timestamp="1630521639">
+<release type="stable" version="0.16.3" date="2022-05-24">
 	<description>
 		<ul>
-			<li>0.16.1: New Steam libraryfolders format (#558)</li>
+			<li>0.16.3: Collection: Expand $game everywhere (#632, #635)</li>
 		</ul>
 	</description>
 </release>
diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,4 @@
-com.github.tkashkin.gamehub (0.16.1) focal; urgency=low
-  * 0.16.1
+com.github.tkashkin.gamehub (0.16.3) focal; urgency=low
+  * 0.16.3: Collection: Expand $game everywhere (#632, #635)
 
- -- Anatoliy Kashkin <[email protected]>  Sun, 19 Sep 2021 22:18:30 +0300
+ -- Anatoliy Kashkin <[email protected]>  Tue, 24 May 2022 22:18:06 +0300
diff --git a/debian/changelog.in b/debian/changelog.in
@@ -1,4 +1,4 @@
-com.github.tkashkin.gamehub (0.16.1~$VERSION_SUFFIX) $DISTRO; urgency=low
-  * 0.16.1
+com.github.tkashkin.gamehub (0.16.3~$VERSION_SUFFIX) $DISTRO; urgency=low
+  * 0.16.3: Collection: Expand $game everywhere (#632, #635)
 
- -- Anatoliy Kashkin <[email protected]>  Sun, 19 Sep 2021 22:18:30 +0300
+ -- Anatoliy Kashkin <[email protected]>  Tue, 24 May 2022 22:18:06 +0300
diff --git a/meson.build b/meson.build
@@ -1,4 +1,4 @@
-project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.16.2')
+project('com.github.tkashkin.gamehub', 'vala', 'c', version: '0.16.3')
 
 i18n = import('i18n')
 gnome = import('gnome')

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 _GH_RDNN="com.github.tkashkin.gamehub"
-_GH_VERSION="0.16.0"
+_GH_VERSION="0.16.3"
 
 _GH_BRANCH="${APPVEYOR_REPO_BRANCH:-$(git symbolic-ref --short -q HEAD)}"
 _GH_COMMIT="$(git rev-parse HEAD)"
@@ -24,10 +24,10 @@ _GPG_PACKAGE="gnupg1"
 export CFLAGS="$CFLAGS -O0"
 export DEB_BUILD_OPTIONS="noopt nostrip nocheck"
 
-if [[ "$APPVEYOR_BUILD_WORKER_IMAGE" = "Ubuntu1804" ]]; then
-	_DEB_TARGET_DISTRO_NAMES=("bionic" "focal" "groovy" "hirsute")
-	_DEB_TARGET_DISTRO_VERSIONS=("18.04" "20.04" "20.10" "21.04")
-	_BUILD_IMAGE="bionic"
+if [[ "$APPVEYOR_BUILD_WORKER_IMAGE" = "Ubuntu" ]]; then
+	_DEB_TARGET_DISTRO_NAMES=("bionic" "focal" "impish" "jammy" "kinetic")
+	_DEB_TARGET_DISTRO_VERSIONS=("18.04" "20.04" "21.10" "22.04" "22.10")
+	_BUILD_IMAGE="jammy"
 else
 	source "/etc/os-release"
 	_DEB_TARGET_DISTRO_ID="$ID"

diff --git a/scripts/launchpad/dput.cf b/scripts/launchpad/dput.cf
@@ -19,16 +19,23 @@ incoming = ~tkashkin/ubuntu/gamehub/focal
 login = anonymous
 allow_unsigned_uploads = 1
 
-[gamehub_groovy]
+[gamehub_impish]
 fqdn = ppa.launchpad.net
 method = ftp
-incoming = ~tkashkin/ubuntu/gamehub/groovy
+incoming = ~tkashkin/ubuntu/gamehub/impish
 login = anonymous
 allow_unsigned_uploads = 1
 
-[gamehub_hirsute]
+[gamehub_jammy]
 fqdn = ppa.launchpad.net
 method = ftp
-incoming = ~tkashkin/ubuntu/gamehub/hirsute
+incoming = ~tkashkin/ubuntu/gamehub/jammy
 login = anonymous
 allow_unsigned_uploads = 1
+
+[gamehub_kinetic]
+fqdn = ppa.launchpad.net
+method = ftp
+incoming = ~tkashkin/ubuntu/gamehub/kinetic
+login = anonymous
+allow_unsigned_uploads = 1
diff --git a/src/data/providers/images/SteamGridDB.vala b/src/data/providers/images/SteamGridDB.vala
@@ -194,7 +194,7 @@ namespace GameHub.Data.Providers.Images
 		public class Image: ImagesProvider.Image
 		{
 			public string  raw_style { get; protected construct set; }
-			public Style?  style     { get; protected construct set; default = null; }
+			public Style?  style     { get; protected set; default = null; }
 			public int     score     { get; protected construct set; default = 0; }
 			public string? author    { get; protected construct set; default = null; }