Merge branch 'main' into ah/release-10.0-merge

# Conflicts: # Package.swift
google · Jul 8, 2024 · e224c8d · e224c8d
2 parents 0e418b8 + 8aa98a1
commit e224c8d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/GoogleDataTransport.podspec b/GoogleDataTransport.podspec
@@ -54,7 +54,7 @@ Shared library for iOS SDK data transport needs.
   # (or larger) fields, so we'd have to set at least PB_FIELD_16BIT
   # anyways.)
   preprocessor_definitions =
-      'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1'\
+      'PB_FIELD_32BIT=1 PB_NO_PACKED_STRUCTS=1 PB_ENABLE_MALLOC=1' \
       'GDTCOR_VERSION=' + s.version.to_s
 
   if ENV['GDT_TEST'] && ENV['GDT_TEST'] == '1' then