Merge pull request #18 from cashapp/entin/v4

Update pod version and dependencies

AardvarkCrashReport.podspec

@@ -1,19 +1,19 @@
 Pod::Spec.new do |s|
  s.name = 'AardvarkCrashReport'
- s.version = '3.0.0'
+ s.version = '4.0.0'
  s.summary = 'AardvarkCrashReport makes it easy to provide high quality data about crashes in your bug reports.'
  s.homepage = 'https://github.com/cashapp/AardvarkCrashReport'
  s.license = { :type => 'Apache 2.0', :file => 'LICENSE' }
  s.author = 'Square'
  s.source = { :git => 'https://github.com/cashapp/AardvarkCrashReport.git', :tag => s.version.to_s }
 
  s.swift_version = '5.0'
- s.ios.deployment_target = '12.0'
+ s.ios.deployment_target = '14.0'
 
  s.static_framework = true
 
  s.source_files = 'Sources/AardvarkCrashReport/**/*.swift'
 
- s.dependency 'Aardvark', '~> 4.0'
+ s.dependency 'Aardvark', '~> 5.0'
  s.dependency 'PLCrashReporter', '~> 1.10'
 end

Example/AardvarkCrashReport.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
  archiveVersion = 1;
  classes = {
  };
- objectVersion = 46;
+ objectVersion = 54;
  objects = {
 
 /* Begin PBXBuildFile section */
@@ -150,23 +150,23 @@
  607FACC81AFB9204008FA782 /* Project object */ = {
  isa = PBXProject;
  attributes = {
+ BuildIndependentTargetsInParallel = YES;
  LastSwiftUpdateCheck = 0830;
- LastUpgradeCheck = 0830;
+ LastUpgradeCheck = 1520;
  ORGANIZATIONNAME = CocoaPods;
  TargetAttributes = {
  607FACCF1AFB9204008FA782 = {
  CreatedOnToolsVersion = 6.3.1;
  DevelopmentTeam = 6385SJ58J2;
- LastSwiftMigration = 0900;
+ LastSwiftMigration = "";
  };
  };
  };
  buildConfigurationList = 607FACCB1AFB9204008FA782 /* Build configuration list for PBXProject "AardvarkCrashReport" */;
  compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
+ developmentRegion = en;
  hasScannedForEncodings = 0;
  knownRegions = (
- English,
  en,
  Base,
  );
@@ -273,6 +273,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -281,14 +282,17 @@
  CLANG_WARN_BOOL_CONVERSION = YES;
  CLANG_WARN_COMMA = YES;
  CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
  CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
  CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
  CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
  CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
  CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -299,6 +303,7 @@
  DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
  ENABLE_STRICT_OBJC_MSGSEND = YES;
  ENABLE_TESTABILITY = YES;
+ ENABLE_USER_SCRIPT_SANDBOXING = NO;
  GCC_C_LANGUAGE_STANDARD = gnu99;
  GCC_DYNAMIC_NO_PIC = NO;
  GCC_NO_COMMON_BLOCKS = YES;
@@ -314,7 +319,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 14.0;
  MTL_ENABLE_DEBUG_INFO = YES;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = iphoneos;
@@ -326,6 +331,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -334,14 +340,17 @@
  CLANG_WARN_BOOL_CONVERSION = YES;
  CLANG_WARN_COMMA = YES;
  CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
  CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
  CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
  CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
  CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
  CLANG_WARN_STRICT_PROTOTYPES = YES;
  CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -352,6 +361,7 @@
  DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
  ENABLE_NS_ASSERTIONS = NO;
  ENABLE_STRICT_OBJC_MSGSEND = YES;
+ ENABLE_USER_SCRIPT_SANDBOXING = NO;
  GCC_C_LANGUAGE_STANDARD = gnu99;
  GCC_NO_COMMON_BLOCKS = YES;
  GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -360,10 +370,11 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 14.0;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
- SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+ SWIFT_COMPILATION_MODE = wholemodule;
+ SWIFT_OPTIMIZATION_LEVEL = "-O";
  VALIDATE_PRODUCT = YES;
  };
  name = Release;
@@ -374,10 +385,12 @@
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  DEVELOPMENT_TEAM = 6385SJ58J2;
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
  INFOPLIST_FILE = AardvarkCrashReport/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = com.squareup.AardvarkCrashReportDemo;
  PRODUCT_NAME = "$(TARGET_NAME)";
@@ -392,10 +405,12 @@
  buildSettings = {
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  DEVELOPMENT_TEAM = 6385SJ58J2;
- "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
  INFOPLIST_FILE = AardvarkCrashReport/Info.plist;
- IPHONEOS_DEPLOYMENT_TARGET = 12.0;
- LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+ IPHONEOS_DEPLOYMENT_TARGET = 14.0;
+ LD_RUNPATH_SEARCH_PATHS = (
+ "$(inherited)",
+ "@executable_path/Frameworks",
+ );
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = com.squareup.AardvarkCrashReportDemo;
  PRODUCT_NAME = "$(TARGET_NAME)";

Example/AardvarkCrashReport.xcodeproj/xcshareddata/xcschemes/AardvarkCrashReportDemo.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "0900"
+ LastUpgradeVersion = "1520"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

Example/AardvarkCrashReport/AppDelegate.swift

@@ -106,7 +106,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  )
  crashBugReporter.promptingDelegate = promptingDelegate
 
- crashBugReporter.composeBugReportWithoutScreenshot()
+ (crashBugReporter as ARKBugReporter).composeBugReportWithoutScreenshot()
  }
  }
 

Example/AardvarkCrashReport/ViewController.swift

@@ -132,7 +132,7 @@ extension ViewController {
  button.layer.cornerRadius = button.bounds.height / 2
  }
 
- applySubviewDistribution(
+ applyVerticalSubviewDistribution(
  [
  [instructionsLabel.distributionItem, 32.fixed],
  buttons.flatMap { [$0.distributionItem, 24.fixed] }.dropLast()

Example/Podfile

@@ -1,14 +1,13 @@
 use_frameworks!
 
-platform :ios, '12.0'
+platform :ios, '14.0'
 
 target 'AardvarkCrashReportDemo' do
  pod 'AardvarkCrashReport', :path => '../AardvarkCrashReport.podspec'
- pod 'AardvarkLoggingUI', '~> 1.0'
- pod 'AardvarkMailUI', '~> 1.0'
- pod 'PLCrashReporter', '~> 1.8'
 
- # The latest release of Paralayout has a bug in Xcode 12, so use the 1.0 development branch for now. Once 1.0 is
- # released, we should switch over to the published version.
- pod 'Paralayout', :git => 'https://github.com/square/Paralayout.git', :branch => 'develop/1.0'
+ pod 'Aardvark', '~> 5.0'
+ pod 'AardvarkLoggingUI', '~> 2.0'
+ pod 'AardvarkMailUI', '~> 2.0'
+ pod 'Paralayout', :git => 'https://github.com/square/Paralayout.git', :tag => '1.0.0-rc.5'
+ pod 'PLCrashReporter', '~> 1.10'
 end

Example/Podfile.lock

@@ -1,23 +1,24 @@
 PODS:
- - Aardvark (4.0.0):
- - CoreAardvark (~> 3.0)
- - AardvarkCrashReport (3.0.0):
- - Aardvark (~> 4.0)
+ - Aardvark (5.0.0):
+ - CoreAardvark (~> 4.0)
+ - AardvarkCrashReport (4.0.0):
+ - Aardvark (~> 5.0)
  - PLCrashReporter (~> 1.10)
- - AardvarkLoggingUI (1.0.0):
- - CoreAardvark (~> 3.0)
- - AardvarkMailUI (1.0.0):
- - Aardvark (~> 4.0)
- - CoreAardvark (3.0.0)
- - Paralayout (0.9.1)
- - PLCrashReporter (1.10.1)
+ - AardvarkLoggingUI (2.0.0):
+ - CoreAardvark (~> 4.0)
+ - AardvarkMailUI (2.0.0):
+ - Aardvark (~> 5.0.0)
+ - CoreAardvark (4.0.0)
+ - Paralayout (1.0.0-rc.5)
+ - PLCrashReporter (1.11.1)
 
 DEPENDENCIES:
+ - Aardvark (~> 5.0)
  - AardvarkCrashReport (from `../AardvarkCrashReport.podspec`)
- - AardvarkLoggingUI (~> 1.0)
- - AardvarkMailUI (~> 1.0)
- - Paralayout (from `https://github.com/square/Paralayout.git`, branch `develop/1.0`)
- - PLCrashReporter (~> 1.8)
+ - AardvarkLoggingUI (~> 2.0)
+ - AardvarkMailUI (~> 2.0)
+ - Paralayout (from `https://github.com/square/Paralayout.git`, tag `1.0.0-rc.5`)
+ - PLCrashReporter (~> 1.10)
 
 SPEC REPOS:
  trunk:
@@ -31,23 +32,23 @@ EXTERNAL SOURCES:
  AardvarkCrashReport:
  :path: "../AardvarkCrashReport.podspec"
  Paralayout:
- :branch: develop/1.0
  :git: https://github.com/square/Paralayout.git
+ :tag: 1.0.0-rc.5
 
 CHECKOUT OPTIONS:
  Paralayout:
- :commit: e887ae8c7cbf8f3d194569c9a8bfb91e9d9a0fb8
  :git: https://github.com/square/Paralayout.git
+ :tag: 1.0.0-rc.5
 
 SPEC CHECKSUMS:
- Aardvark: 6d84a2e9d317d3b5ff7bf9b860c6e2ccf444043c
- AardvarkCrashReport: 4d11fae6db029943a03c2a94db4eae6be6663b4c
- AardvarkLoggingUI: e81aae53c747dcc7c7e757d87b989316c1699261
- AardvarkMailUI: a3b61ff1fbd62c9d33703efc3f0cc34597afad73
- CoreAardvark: 9c943d82736bc261ff4130287aa25e4f35dc7567
- Paralayout: 3e82899bd0d18ad2db21212cd453efa291d2c0cf
- PLCrashReporter: b30195e509f07299ea277d1997b3a39449d05698
+ Aardvark: 783a49c945545c11e82e22a87ef82ced58033c21
+ AardvarkCrashReport: 7ea448a0cb98190f918488846c73ab056d43f23b
+ AardvarkLoggingUI: 20a31259cc57756131fb9b9ebf0ffc8e0c05f5a5
+ AardvarkMailUI: b5324ce0fab7c121e4093baad5280c89a4c8275a
+ CoreAardvark: a3e7c44b2889acdcf14d39a1d703d1e8bdfd94be
+ Paralayout: 844978af530a061a31d849c7b554510190b9cddf
+ PLCrashReporter: 5d2d3967afe0efad61b3048d617e2199a5d1b787
 
-PODFILE CHECKSUM: 1511f97db86d7bfef3721e89da4b9bff28ae494c
+PODFILE CHECKSUM: 4cea4a6979274d8153a914d9d48ec0bc208f2b96
 
-COCOAPODS: 1.10.2
+COCOAPODS: 1.14.3

README.md

@@ -65,8 +65,8 @@ Note that the demo app uses an email-based bug reporter, so it will not be able
 
 ## Requirements
 
-* Xcode 12.0 or later
-* iOS 12.0 or later
+* Xcode 14.0 or later
+* iOS 14.0 or later
 
 ## Contributing
 
@@ -75,7 +75,7 @@ We’re glad you’re interested in AardvarkCrashReport, and we’d love to see
 ## License
 
 ```
-Copyright 2021 Square, Inc.
+Copyright 2024 Block, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.