Skip to content

Commit

Permalink
Remove changes not applicable to main after merge
Browse files Browse the repository at this point in the history
Remove changes not applicable to main after merging adaptations to
appimage.github.io
  • Loading branch information
mgrojo committed Sep 17, 2022
1 parent 2c1a25a commit 3e744fd
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
os: [windows-latest, ubuntu-latest, ubuntu-18.04]
os: [windows-latest, ubuntu-latest]

steps:
- name: Checkout
Expand All @@ -39,7 +39,7 @@ jobs:

release:
name: Continuous AppImage
runs-on: ubuntu-18.04
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions alire.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "play_2048"
description = "2048 game: merge tiles with the same number until you add up to 2048"
version = "0.9.9"
version = "1.0.1-beta"

authors = ["Manuel Gomez"]
maintainers = ["Manuel Gomez <[email protected]>"]
Expand All @@ -13,7 +13,7 @@ tags = ["game", "puzzle", "cross-platform", "sfml"]
executables = ["play_2048"]

[[depends-on]] # This line was added by `alr with`
asfml = "~2.4.1" # This line was added by `alr with`
asfml = "^2.5.0" # This line was added by `alr with`


[[depends-on]] # This line was added by `alr with`
Expand Down
4 changes: 3 additions & 1 deletion src/play_2048.adb
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,10 @@ procedure Play_2048 is
Sprite.setTexture (Game_Sprite, Game_Image);

Set_Text_Style (Score_Text);

-- Not available in v2.4:
-- Text.setLineSpacing (Score_Text, 0.85);
Text.setLineSpacing (Score_Text, 0.85);

Set_Text_Style (Game_Text);

RenderWindow.setIcon
Expand Down

0 comments on commit 3e744fd

Please sign in to comment.