Drop support for development build

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:
           bundle: atlas.flatpak
-          manifest-path: build-aux/appcenter/com.github.ryonakano.atlas.Devel.yml
+          manifest-path: com.github.ryonakano.atlas.yml
           run-tests: true
           repository-name: appcenter
           repository-url: https://flatpak.elementary.io/repo.flatpakrepo

.github/workflows/flatpak-x-checker.yml

@@ -13,19 +13,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Update development manifest
-        uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
-        env:
-          GIT_AUTHOR_NAME: github-actions[bot]
-          GIT_COMMITTER_NAME: github-actions[bot]
-          # email sets "github-actions[bot]" as commit author, see https://github.com/orgs/community/discussions/26560
-          GIT_AUTHOR_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
-          GIT_COMMITTER_EMAIL: 41898282+github-actions[bot]@users.noreply.github.com
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          # use --edit-only instead of --update to create single PR that updates all manifests
-          args: --edit-only --never-fork build-aux/appcenter/com.github.ryonakano.atlas.Devel.yml
-
       - name: Update stable manifest
         uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest
         env:

.gitignore

@@ -1,6 +1,6 @@
 # build dirs
 .flatpak-builder
-builddir*
+build*
 
 # vim
 *.swp

README.md

@@ -28,8 +28,8 @@ flatpak remote-add --user --if-not-exists appcenter https://flatpak.elementary.i
 To build and install, use `flatpak-builder`, then execute with `flatpak run`:
 
 ```
-flatpak-builder builddir --user --install --force-clean --install-deps-from=appcenter build-aux/appcenter/com.github.ryonakano.atlas.Devel.yml
-flatpak run com.github.ryonakano.atlas.Devel
+flatpak-builder builddir --user --install --force-clean --install-deps-from=appcenter com.github.ryonakano.atlas.yml
+flatpak run com.github.ryonakano.atlas
 ```
 
 ### From Source Code (Native)
@@ -42,7 +42,7 @@ You'll need the following dependencies:
 * libgranite-7-dev (>= 7.2.0)
 * libgtk-4-dev
 * libshumate-dev
-* meson (>= 0.58.0)
+* meson (>= 0.57.0)
 * valac
 
 Run `meson setup` to configure the build environment and run `meson compile` to build:

data/atlas.desktop.in.in → data/atlas.desktop.in

@@ -1,10 +1,10 @@
 [Desktop Entry]
-Name=@APP_NAME@
+Name=Atlas
 GenericName=Map
 Comment=View where to go
 Categories=GTK;Utility;Science;Maps;
-Exec=@APP_ID@
-Icon=@APP_ID@
+Exec=com.github.ryonakano.atlas
+Icon=com.github.ryonakano.atlas
 Type=Application
 Terminal=false
 Keywords=Trip;Explore;

data/atlas.gschema.xml.in → data/atlas.gschema.xml

@@ -5,7 +5,7 @@
     <value value="1" nick="transport"/>
   </enum>
 
-  <schema path="/com/github/ryonakano/atlas/" id="@APP_ID@">
+  <schema path="/com/github/ryonakano/atlas/" id="com.github.ryonakano.atlas">
     <key type="d" name="latitude">
       <default>51.2840</default>
       <summary>Latitude</summary>

data/atlas.metainfo.xml.in.in → data/atlas.metainfo.xml.in

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2014-2015 Atlas Developers, 2018-2025 Ryo Nakano -->
 <component type="desktop-application">
-  <id>@APP_ID@</id>
-  <launchable type="desktop-id">@APP_ID@.desktop</launchable>
-  <translation type="gettext">@GETTEXT_PACKAGE@</translation>
+  <id>com.github.ryonakano.atlas</id>
+  <launchable type="desktop-id">com.github.ryonakano.atlas.desktop</launchable>
+  <translation type="gettext">com.github.ryonakano.atlas</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
 
@@ -26,11 +26,11 @@
   <screenshots>
     <screenshot type="default" environment="pantheon">
       <caption>See locations on a map</caption>
-      <image>https://raw.githubusercontent.com/ryonakano/atlas/@VERSION@/data/screenshots/screenshot-light.png</image>
+      <image>https://raw.githubusercontent.com/ryonakano/atlas/3.1.0/data/screenshots/screenshot-light.png</image>
     </screenshot>
     <screenshot environment="pantheon:dark">
       <caption>See locations on a map</caption>
-      <image>https://raw.githubusercontent.com/ryonakano/atlas/@VERSION@/data/screenshots/screenshot-dark.png</image>
+      <image>https://raw.githubusercontent.com/ryonakano/atlas/3.1.0/data/screenshots/screenshot-dark.png</image>
     </screenshot>
   </screenshots>
 

data/meson.build

@@ -3,57 +3,30 @@ icon_sizes = ['16', '24', '32', '48', '64', '128']
 foreach i : icon_sizes
     install_data(
         'icons' / i / meson.project_name() + '.png',
-        rename: app_id + '.png',
+        rename: meson.project_name() + '.png',
         install_dir: get_option('datadir') / 'icons' / 'hicolor' / i + 'x' + i / 'apps'
     )
 endforeach
 
-desktop_conf = configuration_data()
-desktop_conf.set('APP_NAME', app_name)
-desktop_conf.set('APP_ID', app_id)
-desktop_file_in = configure_file(
-    input: 'atlas.desktop.in.in',
-    output: '@0@.desktop.in'.format(app_id),
-    configuration: desktop_conf
-)
-
-desktop_file = i18n.merge_file(
-    input: desktop_file_in,
-    output: '@0@.desktop'.format(app_id),
+i18n.merge_file(
+    input: 'atlas.desktop.in',
+    output: meson.project_name() + '.desktop',
     po_dir: meson.project_source_root() / 'po',
     type: 'desktop',
     install: true,
     install_dir: get_option('datadir') / 'applications'
 )
 
-appstream_conf = configuration_data()
-appstream_conf.set('APP_ID', app_id)
-appstream_conf.set('GETTEXT_PACKAGE', meson.project_name())
-appstream_conf.set('VERSION', meson.project_version())
-appstream_file_in = configure_file(
-    input: 'atlas.metainfo.xml.in.in',
-    output: '@0@.metainfo.xml.in'.format(app_id),
-    configuration: appstream_conf
-)
-
-appstream_file = i18n.merge_file(
-    input: appstream_file_in,
-    output: '@0@.metainfo.xml'.format(app_id),
+i18n.merge_file(
+    input: 'atlas.metainfo.xml.in',
+    output: meson.project_name() + '.metainfo.xml',
     po_dir: meson.project_source_root() / 'po',
     install: true,
     install_dir: get_option('datadir') / 'metainfo'
 )
 
-gschema_conf = configuration_data()
-gschema_conf.set('APP_ID', app_id)
-gschema_file = configure_file(
-    input: 'atlas.gschema.xml.in',
-    output: '@0@.gschema.xml'.format(app_id),
-    configuration: gschema_conf
-)
-
 install_data(
-    gschema_file,
+    'atlas.gschema.xml',
     install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )
 

meson.build

@@ -2,16 +2,9 @@ project(
     'com.github.ryonakano.atlas',
     'vala', 'c',
     version: '3.1.0',
-    meson_version: '>=0.58.0'
+    meson_version: '>=0.57.0'
 )
 
-app_name = 'Atlas'
-app_id = meson.project_name()
-if get_option('development')
-    app_name += ' (Development)'
-    app_id += '.Devel'
-endif
-
 gnome = import('gnome')
 i18n = import('i18n')
 

po/POTFILES

@@ -1,4 +1,4 @@
-data/atlas.desktop.in.in
-data/atlas.metainfo.xml.in.in
+data/atlas.desktop.in
+data/atlas.metainfo.xml.in
 src/Application.vala
 src/MainWindow.vala

src/Application.vala

@@ -14,14 +14,13 @@ public class Atlas.Application : Adw.Application {
 
     public Application () {
         Object (
-            application_id: Config.APP_ID,
-            flags: ApplicationFlags.DEFAULT_FLAGS,
-            resource_base_path: Config.RESOURCE_PREFIX
+            application_id: "com.github.ryonakano.atlas",
+            flags: ApplicationFlags.DEFAULT_FLAGS
         );
     }
 
     static construct {
-        settings = new Settings (Config.APP_ID);
+        settings = new Settings ("com.github.ryonakano.atlas");
     }
 
     private void setup_style () {

src/Config.vala.in

@@ -1,6 +1,4 @@
 namespace Config {
     public const string LOCALEDIR = @LOCALEDIR@;
     public const string GETTEXT_PACKAGE = @GETTEXT_PACKAGE@;
-    public const string APP_ID = @APP_ID@;
-    public const string RESOURCE_PREFIX = @RESOURCE_PREFIX@;
 }

src/MainWindow.vala

@@ -42,11 +42,6 @@ public class Atlas.MainWindow : Adw.ApplicationWindow {
     private MapWidget map_widget;
 
     construct {
-        // Distinct development build visually
-        if (".Devel" in Config.APP_ID) {
-            add_css_class ("devel");
-        }
-
         title = "Atlas";
         add_action_entries (ACTION_ENTRIES, this);
 

src/MapWidget.vala

@@ -110,7 +110,7 @@ public class Atlas.MapWidget : Gtk.Box {
         GClue.Simple? simple = null;
 
         try {
-            simple = yield new GClue.Simple (Config.APP_ID, GClue.AccuracyLevel.EXACT, null);
+            simple = yield new GClue.Simple ("com.github.ryonakano.atlas", GClue.AccuracyLevel.EXACT, null);
         } catch (Error e) {
             warning ("Failed to connect to GeoClue2 service: %s", e.message);
         }

src/meson.build

@@ -1,8 +1,6 @@
 config_data = configuration_data()
 config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 config_data.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-config_data.set_quoted('APP_ID', app_id)
-config_data.set_quoted('RESOURCE_PREFIX', '/' + meson.project_name().replace('.', '/'))
 config_file = configure_file(
     input: 'Config.vala.in',
     output: '@BASENAME@',
@@ -30,7 +28,7 @@ sources = files(
 )
 
 executable(
-    app_id,
+    meson.project_name(),
     asresources,
     config_file,
     sources,