Skip to content

Commit 078339b

Browse files
authored
Merge branch 'master' into jeremypw/link-profiler
2 parents 09bfcbc + ca8b436 commit 078339b

File tree

637 files changed

+51471
-32183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

637 files changed

+51471
-32183
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
image: ghcr.io/elementary/docker:${{ matrix.version }}
1919

2020
steps:
21-
- uses: actions/checkout@v4
21+
- uses: actions/checkout@v5
2222
- name: Install Dependencies
2323
run: |
2424
apt update
@@ -45,12 +45,12 @@ jobs:
4545
fail-fast: false
4646

4747
container:
48-
image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }}
48+
image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }}
4949
options: --privileged
5050

5151
steps:
5252
- name: Checkout
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v5
5454

5555
- name: Build
5656
uses: flatpak/flatpak-github-actions/[email protected]
@@ -71,7 +71,7 @@ jobs:
7171

7272
steps:
7373
- name: Checkout
74-
uses: actions/checkout@v4
74+
uses: actions/checkout@v5
7575

7676
- name: Lint
7777
run: io.elementary.vala-lint -d .

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
steps:
1111
- name: Clone repository
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v5
1313
with:
1414
token: ${{ secrets.GIT_USER_TOKEN }}
1515

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: elementary/actions/release@master
12+
- uses: actions/checkout@v5
13+
- uses: elementary/actions/release@main
1414
env:
1515
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
1616
GIT_USER_NAME: "elementaryBot"
1717
GIT_USER_EMAIL: "[email protected]"
1818
with:
19-
release_branch: 'odin'
19+
release_branch: 'noble'

data/code.metainfo.xml.in

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@
2929

3030
<screenshots>
3131
<screenshot type="default">
32-
<image>https://raw.githubusercontent.com/elementary/code/7.4.0/data/screenshot.png</image>
32+
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot.png</image>
3333
</screenshot>
3434
<screenshot>
35-
<image>https://raw.githubusercontent.com/elementary/code/7.4.0/data/screenshot-dark.png</image>
35+
<image>https://raw.githubusercontent.com/elementary/code/8.1.1/data/screenshot-dark.png</image>
3636
</screenshot>
3737
</screenshots>
3838

@@ -68,7 +68,46 @@
6868
<update_contact>contact_AT_elementary.io</update_contact>
6969

7070
<releases>
71-
<release version="8.0.0" date="2025-06-13" urgency="medium">
71+
<release version="8.1.1" date="2025-09-06" urgency="medium">
72+
<description>
73+
<p>Minor updates:</p>
74+
<ul>
75+
<li>The terminal pane is now synchronized with the Terminal app foreground, background and palette settings</li>
76+
<li>The terminal pane is now synchronized with GNOME font and cursor blink settings</li>
77+
<li>Updated translations</li>
78+
</ul>
79+
</description>
80+
<issues>
81+
<issue url="https://github.com/elementary/code/issues/1586">Relies on external Terminal settings keys</issue>
82+
<issue url="https://github.com/elementary/code/issues/457">Exiting process running in terminal leaves terminal useless</issue>
83+
<issue url="https://github.com/elementary/code/issues/276">Listen for changes to Terminal color scheme</issue>
84+
</issues>
85+
</release>
86+
<release version="8.1.0" date="2025-08-01" urgency="medium">
87+
<description>
88+
<p>Improvements:</p>
89+
<ul>
90+
<li>The Project Chooser context menu now includes an option to clone a remote git repository</li>
91+
</ul>
92+
<p>Minor updates:</p>
93+
<ul>
94+
<li>The "Open Folder" action now appears in the Project Chooser context menu</li>
95+
<li>The Vala symbol pane now shows a spinner while loading</li>
96+
<li>The filter in the C symbol pane now works</li>
97+
<li>Updated translations</li>
98+
</ul>
99+
</description>
100+
<issues>
101+
<issue url="https://github.com/elementary/code/issues/1629">Markdown plug: Extending an ordered list at end of document causes infinite loop</issue>
102+
<issue url="https://github.com/elementary/code/issues/1603">8.0.0 FTBFS with GCC 14 (-Wimplicit-function-declaration)</issue>
103+
<issue url="https://github.com/elementary/code/issues/1597">Symbol pane filter should work for C symbols too</issue>
104+
<issue url="https://github.com/elementary/code/issues/1443">Code crashes when deleting lines</issue>
105+
<issue url="https://github.com/elementary/code/issues/740">Blank tooltip on hovering expanded empty folder</issue>
106+
<issue url="https://github.com/elementary/code/issues/385">Do not allow projects to be moved to trash from the sidebar</issue>
107+
<issue url="https://github.com/elementary/code/issues/26">Outline plugin does not indicate when it is loading</issue>
108+
</issues>
109+
</release>
110+
<release version="8.0.0" date="2025-06-20" urgency="medium">
72111
<description>
73112
<p>Improvements:</p>
74113
<ul>

data/icons/git-symbolic.svg

Lines changed: 4 additions & 0 deletions
Loading

data/io.elementary.code.gresource.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<gresources>
33
<gresource prefix="/io/elementary/code">
44
<file alias="Application.css" compressed="true">Application.css</file>
5-
<file alias="git.svg" compressed="true" preprocess="xml-stripblanks">icons/48/git.svg</file>
65
<file alias="lang-class-abstract.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/abstractclass.svg</file>
76
<file alias="lang-method-abstract.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/abstractmethod.svg</file>
87
<file alias="lang-property-abstract.svg" compressed="true" preprocess="xml-stripblanks">icons/SymbolOutline/abstractproperty.svg</file>
@@ -30,8 +29,10 @@
3029
<file alias="scalable/actions/panel-right-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/panel-right-symbolic.svg</file>
3130
</gresource>
3231
<gresource prefix="/io/elementary/code/icons">
32+
<file alias="48x48/actions/git.svg" compressed="true" preprocess="xml-stripblanks">icons/48/git.svg</file>
3333
<file alias="48x48/actions/open-project.svg" compressed="true" preprocess="xml-stripblanks">icons/48/open-project.svg</file>
3434
<file alias="scalable/actions/filter-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/filter-symbolic.svg</file>
35+
<file alias="scalable/actions/git-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/git-symbolic.svg</file>
3536
<file alias="scalable/emblems/emblem-git-modified-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/emblem-git-modified-symbolic.svg</file>
3637
<file alias="scalable/emblems/emblem-git-new-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/emblem-git-new-symbolic.svg</file>
3738
</gresource>

data/io.elementary.code.gschema.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,16 @@
162162
<summary>The default build directory's relative path.</summary>
163163
<description>The directory, relative to the project root, at which to open the terminal pane and where to run build commands by default.</description>
164164
</key>
165+
<key name="default-projects-folder" type="s">
166+
<default>''</default>
167+
<summary>The default Projects folder</summary>
168+
<description>The path to the folder below which projects are saved or cloned</description>
169+
</key>
170+
<key name="default-remote" type="s">
171+
<default>''</default>
172+
<summary>The default git remote</summary>
173+
<description>The URL of the remote from where repositories can be cloned, for example https://github.com/elementary/</description>
174+
</key>
165175
<key name="prefer-dark-style" type="b">
166176
<default>false</default>
167177
<summary>Request dark Gtk stylesheet variant</summary>

io.elementary.code.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
app-id: io.elementary.code
1+
id: io.elementary.code
22
runtime: io.elementary.Sdk # The outline plugin requires libvala which is only in the SDK, not the runtime
3-
runtime-version: '7.1'
3+
runtime-version: '8.2'
44
sdk: io.elementary.Sdk
55
command: io.elementary.code
66
finish-args:
@@ -26,6 +26,8 @@ cleanup:
2626
- '/share/vala'
2727
- '*.a'
2828
- '*.la'
29+
build-options:
30+
libdir: /app/lib
2931
modules:
3032
- name: gtksourceview
3133
buildsystem: meson
@@ -57,7 +59,7 @@ modules:
5759
sources:
5860
- type: git
5961
url: https://gitlab.gnome.org/GNOME/libgit2-glib.git
60-
tag: v1.1.0
62+
tag: v1.2.0
6163
modules:
6264
- name: ssh2
6365
buildsystem: cmake-ninja
@@ -66,7 +68,6 @@ modules:
6668
- '-DBUILD_SHARED_LIBS:BOOL=ON'
6769
- '-DBUILD_EXAMPLES:BOOL=OFF'
6870
- '-DBUILD_TESTING:BOOL=OFF'
69-
- '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib'
7071
cleanup:
7172
- '/share/man'
7273
- '/share/doc'
@@ -81,7 +82,7 @@ modules:
8182
sources:
8283
- type: git
8384
url: https://github.com/libgit2/libgit2.git
84-
tag: 'v1.5.1'
85+
tag: 'v1.7.2'
8586

8687
- name: editorconfig
8788
buildsystem: cmake-ninja

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ project(
22
'io.elementary.code',
33
'vala', 'c',
44
meson_version: '>= 0.58.0',
5-
version: '7.4.0'
5+
version: '8.1.1'
66
)
77

88
add_project_arguments([
@@ -34,7 +34,7 @@ granite_dep = dependency('granite', version: '>=6.0.0')
3434
handy_dep = dependency('libhandy-1', version: '>=0.90.0')
3535
gtksourceview_dep = dependency('gtksourceview-4')
3636
peas_dep = dependency('libpeas-2')
37-
git_dep = dependency('libgit2-glib-1.0')
37+
git_dep = dependency('libgit2-glib-1.0', version: '>=1.2.0')
3838
fontconfig_dep = dependency('fontconfig')
3939
pangofc_dep = dependency('pangoft2')
4040
posix_dep = meson.get_compiler('vala').find_library('posix')

plugins/brackets-completion/brackets-completion.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
99
"", " ", "\b", "\r", "\n", "\t", ",", ".", ";", ":"
1010
};
1111

12-
public Object object { owned get; construct; }
12+
public Object object { owned get; set construct; }
1313

1414
private Gee.HashMap<string, string> brackets;
1515
private Gee.HashMap<uint, string> keys;

0 commit comments

Comments
 (0)