Skip to content

Commit 96223ae

Browse files
committed
Merge remote-tracking branch 'origin/main' into workflow/auto-update-deps-234-20240910-133322
2 parents f9ed78f + 07c2184 commit 96223ae

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

.github/workflows/desktop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ jobs:
270270
sudo chmod -R +rwx ~/Library/Logs/DiagnosticReports/* || :
271271
272272
- name: Archive crashes and binaries (linux)
273-
uses: actions/upload-artifact@v2
273+
uses: actions/upload-artifact@v3
274274
if: failure() && startsWith(matrix.build_type, 'Debug') && startsWith(matrix.os, 'ubuntu')
275275
with:
276276
name: crashes-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.architecture }}-${{ matrix.python_version }}
@@ -279,7 +279,7 @@ jobs:
279279
/tmp/bins/*
280280
281281
- name: Archive crashes (mac)
282-
uses: actions/upload-artifact@v2
282+
uses: actions/upload-artifact@v3
283283
if: failure() && startsWith(matrix.build_type, 'Debug') && startsWith(matrix.os, 'macos')
284284
with:
285285
name: crashes-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.architecture }}-${{ matrix.python_version }}-${{ matrix.xcode_version }}

analytics/src/include/firebase/analytics.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -453,14 +453,6 @@ void LogEvent(const char* name, const char* parameter_name,
453453
/// @endif
454454
void LogEvent(const char* name);
455455

456-
// clang-format off
457-
#ifdef SWIG
458-
// Modify the following overload with unsafe, so that we can do some pinning
459-
// in the C# code.
460-
%csmethodmodifiers LogEvent "public unsafe"
461-
#endif // SWIG
462-
// clang-format on
463-
464456
/// @brief Log an event with associated parameters.
465457
///
466458
/// An Event is an important occurrence in your app that you want to

0 commit comments

Comments
 (0)