Merge branch 'main' into beta

CMakeLists.txt

@@ -81,7 +81,8 @@ set(CUSTOM_WEBSITE_URL "" CACHE STRING "Enable custom local webserver to check u
 
 if(ENABLE_SENTRY)
   set(SENTRY_DIR "" CACHE STRING "Sentry native location")
-  set(SENTRY_DNS "" CACHE STRING "Sentry DNS URL")
+  set(SENTRY_DSN "" CACHE STRING "Sentry Data Source Name URL")
+  set(SENTRY_ENV "development" CACHE STRING "Sentry environment (production, testing, development, etc.)")
 endif()
 
 if(ENABLE_NEWS OR ENABLE_UPDATER OR ENABLE_DRM)

laf

@@ -1 +1 @@
-Subproject commit 758319cc494b9293c632415b61404a1cf3177503
+Subproject commit 8f91e164d1d23a3b0dc751bc0f9185af27dcb2c7

src/app/CMakeLists.txt

@@ -748,7 +748,8 @@ if(ENABLE_SENTRY)
   target_compile_definitions(app-lib PUBLIC
     -DENABLE_SENTRY
     -DSENTRY_BUILD_STATIC=1
-    -DSENTRY_DNS="${SENTRY_DNS}")
+    -DSENTRY_DSN="${SENTRY_DSN}"
+    -DSENTRY_ENV="${SENTRY_ENV}")
   add_subdirectory(${SENTRY_DIR} sentry)
   target_link_libraries(app-lib sentry)
 endif()

src/app/sentry_wrapper.cpp

@@ -26,7 +26,8 @@ std::string Sentry::m_dbdir;
 void Sentry::init()
 {
   sentry_options_t* options = sentry_options_new();
-  sentry_options_set_dsn(options, SENTRY_DNS);
+  sentry_options_set_dsn(options, SENTRY_DSN);
+  sentry_options_set_environment(options, SENTRY_ENV);
 
   std::string release = "aseprite@";
   release += get_app_version();