Skip to content

Commit 6e1bfaa

Browse files
committed
Cleanup
1 parent d5a91ac commit 6e1bfaa

3 files changed

Lines changed: 15 additions & 16 deletions

File tree

analytics/src/analytics_ios.mm

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -246,18 +246,19 @@ void LogEvent(const char* name) {
246246
return Future<void>(api, future_handle.get());
247247
}
248248

249-
[AppleTransactionVerifier verifyWithTransactionId:SafeString(transaction_id)
250-
completion:^(BOOL isFound) {
251-
MutexLock lock(g_mutex);
252-
if (!internal::IsInitialized()) return;
253-
254-
auto* api = internal::FutureData::Get()->api();
255-
if (isFound) {
256-
api->Complete(future_handle, 0, "");
257-
} else {
258-
api->Complete(future_handle, -1, "StoreKit 2 transaction not found.");
259-
}
260-
}];
249+
[AppleTransactionVerifier
250+
verifyWithTransactionId:SafeString(transaction_id)
251+
completion:^(BOOL isFound) {
252+
MutexLock lock(g_mutex);
253+
if (!internal::IsInitialized()) return;
254+
255+
auto* api = internal::FutureData::Get()->api();
256+
if (isFound) {
257+
api->Complete(future_handle, 0, "");
258+
} else {
259+
api->Complete(future_handle, -1, "StoreKit 2 transaction not found.");
260+
}
261+
}];
261262

262263
return Future<void>(api, future_handle.get());
263264
}

scripts/gha/integration_testing/xcode_tool.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,6 @@ def add_custom_framework(framework_path)
163163
local_framework_path = "Frameworks/#{framework_name}"
164164
# Add the lib file as a reference
165165
libRef = @project['Frameworks'].new_file(framework_path)
166-
if framework_name.end_with?('.xcframework')
167-
libRef.last_known_file_type = 'wrapper.xcframework'
168-
end
169166
# Add it to the build phase
170167
@target.frameworks_build_phase.add_file_reference(libRef)
171168
puts 'Finished adding framework.'

testing/sample_framework/src/app_framework.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
// crashing when they are missing from the system libraries on older OSs.
3434
namespace std {
3535
inline namespace __1 {
36-
__attribute__((weak)) void __libcpp_verbose_abort(const char* format, ...) noexcept {
36+
__attribute__((weak)) void __libcpp_verbose_abort(const char* format,
37+
...) noexcept {
3738
va_list list;
3839
va_start(list, format);
3940
vfprintf(stderr, format, list);

0 commit comments

Comments
 (0)