Skip to content

Commit 6c36acc

Browse files
authored
Fix issue #181 plus a few meson warnings (#189)
1. One line moved in AutoFixTest.vala 2. Bumped meson version to >= 0.56 3. Changes in meson.build to avoid warnings3.
1 parent 1ec0e6c commit 6c36acc

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
project(
22
'io.elementary.vala-lint', 'vala', 'c',
33
version: '0.1.0',
4-
meson_version : '>= 0.43'
4+
meson_version : '>= 0.56'
55
)
66

77
add_project_arguments('-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), language:'c')
88

99
valac = meson.get_compiler('vala')
10-
libvala_version = run_command(valac.cmd_array()[0], '--api-version').stdout().strip()
10+
libvala_version = run_command(valac.cmd_array()[0], '--api-version', check: true).stdout().strip()
1111

1212
gio_dep = dependency('gio-2.0', version: '>=2.56.4')
1313
posix_dep = valac.find_library('posix')

test/AutoFixTest.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class AutoFixTest : GLib.Object {
3939
if (src_type == DIRECTORY) {
4040
if (!dest.query_exists ()) {
4141
dest.make_directory (cancellable);
42+
src.copy_attributes (dest, flags, cancellable);
4243
}
4344

44-
src.copy_attributes (dest, flags, cancellable);
4545

4646
string src_path = src.get_path ();
4747
string dest_path = dest.get_path ();

test/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ test_envars = [
4141
test('file', file_test, env: test_envars)
4242
test('auto-fix', auto_fix_test, env: test_envars)
4343

44-
test('self', vala_lint, workdir: meson.source_root(), env: test_envars)
44+
test('self', vala_lint, workdir: meson.current_source_dir(), env: test_envars)

0 commit comments

Comments
 (0)