Merge pull request #36 from square/federman/swift_support_2.0

[3.0] Swift!
square · Sep 23, 2016 · 3590861 · 3590861
2 parents 0773656 + 2f7829d
commit 3590861
Show file tree

Hide file tree

Showing 82 changed files with 1,545 additions and 2,012 deletions.
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+3.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: objective-c
-osx_image: xcode7
+osx_image: xcode8
 before_script:
     - bundle install
 script:
-    - xcodebuild -project Aardvark.xcodeproj -scheme Aardvark -sdk iphonesimulator -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build test
-    - xcodebuild -project Aardvark.xcodeproj -scheme "Aardvark-iOS" -sdk iphonesimulator -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build
     - bundle exec pod repo update --silent
-    - bundle exec pod lib lint --verbose --fail-fast
+    - bundle exec pod lib lint --verbose --fail-fast CoreAardvark.podspec
+    - bundle exec pod lib lint --verbose --fail-fast Aardvark.podspec
+    - xcodebuild -project Aardvark.xcodeproj -scheme Aardvark -sdk iphonesimulator -destination "platform=iOS Simulator,name=iPhone SE" test
+    - xcodebuild -project AardvarkSample/AardvarkSample.xcodeproj -scheme AardvarkSample -sdk iphonesimulator -configuration Debug -PBXBuildsContinueAfterErrors=0 ACTIVE_ARCH_ONLY=0 build
diff --git a/Aardvark.podspec b/Aardvark.podspec
@@ -1,14 +1,14 @@
 Pod::Spec.new do |s|
   s.name     = 'Aardvark'
-  s.version  = '2.0.0'
+  s.version  = '3.0.0'
   s.license  = 'Apache License, Version 2.0'
   s.summary  = 'Aardvark is a library that makes it dead simple to create actionable bug reports.'
   s.homepage = 'https://github.com/square/Aardvark'
   s.authors  = 'Square'
   s.source   = { :git => 'https://github.com/square/Aardvark.git', :tag => s.version }
-  s.ios.deployment_target = '6.0'
-  s.source_files = 'Aardvark/**/*.{h,m}'
+  s.ios.deployment_target = '8.0'
+  s.source_files = 'Aardvark/**/*.{h,m,swift}'
   s.private_header_files = 'Aardvark/*_Testing.h', 'Aardvark/Private Categories/*.h'
 
-  s.dependency 'CoreAardvark', '~> 1.0'
+  s.dependency 'CoreAardvark', '~> 2.0'
 end
diff --git a/Aardvark.xcodeproj/project.pbxproj b/Aardvark.xcodeproj/project.pbxproj
diff --git a/Aardvark.xcodeproj/xcshareddata/xcschemes/Aardvark.xcscheme b/Aardvark.xcodeproj/xcshareddata/xcschemes/Aardvark.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0710"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,26 +14,12 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EAD1442019E073FB0065A1FF"
-               BuildableName = "libAardvark.a"
+               BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
+               BuildableName = "Aardvark.framework"
                BlueprintName = "Aardvark"
                ReferencedContainer = "container:Aardvark.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EAD1442B19E073FB0065A1FF"
-               BuildableName = "AardvarkTests.xctest"
-               BlueprintName = "AardvarkTests"
-               ReferencedContainer = "container:Aardvark.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -46,18 +32,28 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EAD1442B19E073FB0065A1FF"
+               BlueprintIdentifier = "EA3C1D9F1D934A260048C4CD"
                BuildableName = "AardvarkTests.xctest"
                BlueprintName = "AardvarkTests"
                ReferencedContainer = "container:Aardvark.xcodeproj">
             </BuildableReference>
          </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EA3C1D901D934A210048C4CD"
+               BuildableName = "CoreAardvarkTests.xctest"
+               BlueprintName = "CoreAardvarkTests"
+               ReferencedContainer = "container:Aardvark.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EAD1442019E073FB0065A1FF"
-            BuildableName = "libAardvark.a"
+            BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
+            BuildableName = "Aardvark.framework"
             BlueprintName = "Aardvark"
             ReferencedContainer = "container:Aardvark.xcodeproj">
          </BuildableReference>
@@ -78,8 +74,8 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EAD1442019E073FB0065A1FF"
-            BuildableName = "libAardvark.a"
+            BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
+            BuildableName = "Aardvark.framework"
             BlueprintName = "Aardvark"
             ReferencedContainer = "container:Aardvark.xcodeproj">
          </BuildableReference>
@@ -96,8 +92,8 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EAD1442019E073FB0065A1FF"
-            BuildableName = "libAardvark.a"
+            BlueprintIdentifier = "4551A2C11BDACF9000F216D0"
+            BuildableName = "Aardvark.framework"
             BlueprintName = "Aardvark"
             ReferencedContainer = "container:Aardvark.xcodeproj">
          </BuildableReference>

diff --git a/Aardvark.xcodeproj/xcshareddata/xcschemes/CoreAardvark-iOS.xcscheme b/Aardvark.xcodeproj/xcshareddata/xcschemes/CoreAardvark-iOS.xcscheme
diff --git a/Aardvark.xcodeproj/xcshareddata/xcschemes/CoreAardvark.xcscheme b/Aardvark.xcodeproj/xcshareddata/xcschemes/CoreAardvark.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,8 +14,8 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "EAF2FE911D47171700931663"
-               BuildableName = "libCoreAardvark.a"
+               BlueprintIdentifier = "EAF2FE9F1D47172400931663"
+               BuildableName = "CoreAardvark.framework"
                BlueprintName = "CoreAardvark"
                ReferencedContainer = "container:Aardvark.xcodeproj">
             </BuildableReference>
@@ -28,7 +28,26 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "EA3C1D901D934A210048C4CD"
+               BuildableName = "CoreAardvarkTests.xctest"
+               BlueprintName = "CoreAardvarkTests"
+               ReferencedContainer = "container:Aardvark.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "EAF2FE9F1D47172400931663"
+            BuildableName = "CoreAardvark.framework"
+            BlueprintName = "CoreAardvark"
+            ReferencedContainer = "container:Aardvark.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
@@ -45,8 +64,8 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EAF2FE911D47171700931663"
-            BuildableName = "libCoreAardvark.a"
+            BlueprintIdentifier = "EAF2FE9F1D47172400931663"
+            BuildableName = "CoreAardvark.framework"
             BlueprintName = "CoreAardvark"
             ReferencedContainer = "container:Aardvark.xcodeproj">
          </BuildableReference>
@@ -63,8 +82,8 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EAF2FE911D47171700931663"
-            BuildableName = "libCoreAardvark.a"
+            BlueprintIdentifier = "EAF2FE9F1D47172400931663"
+            BuildableName = "CoreAardvark.framework"
             BlueprintName = "CoreAardvark"
             ReferencedContainer = "container:Aardvark.xcodeproj">
          </BuildableReference>

diff --git a/Aardvark/ARKBugReporter.h b/Aardvark/ARKBugReporter.h
@@ -18,8 +18,8 @@
 //  limitations under the License.
 //
 
-#import <CoreAardvark/ARKLogStore.h>
-#import <Foundation/Foundation.h>
+@import CoreAardvark;
+@import Foundation;
 
 
 @protocol ARKBugReporter <NSObject>

diff --git a/Aardvark/ARKDefaultLogFormatter.h b/Aardvark/ARKDefaultLogFormatter.h
@@ -18,17 +18,17 @@
 //  limitations under the License.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 #import <Aardvark/ARKLogFormatter.h>
 
 
 @interface ARKDefaultLogFormatter : NSObject <ARKLogFormatter>
 
 /// The string that is prepended to error logs.
-@property (nullable, nonatomic, copy) NSString *errorLogPrefix;
+@property (nonnull, nonatomic, copy) NSString *errorLogPrefix;
 
 /// The string that is prepended to separator logs.
-@property (nullable, nonatomic, copy) NSString *separatorLogPrefix;
+@property (nonnull, nonatomic, copy) NSString *separatorLogPrefix;
 
 @end
diff --git a/Aardvark/ARKDefaultLogFormatter.m b/Aardvark/ARKDefaultLogFormatter.m
@@ -18,7 +18,7 @@
 //  limitations under the License.
 //
 
-#import <CoreAardvark/ARKLogMessage.h>
+@import CoreAardvark;
 
 #import "ARKDefaultLogFormatter.h"
 

diff --git a/Aardvark/ARKEmailBugReporter.h b/Aardvark/ARKEmailBugReporter.h
@@ -18,8 +18,8 @@
 //  limitations under the License.
 //
 
-#import <Foundation/Foundation.h>
-#import <MessageUI/MessageUI.h>
+@import MessageUI;
+@import UIKit;
 
 #import <Aardvark/ARKBugReporter.h>
 
@@ -42,7 +42,10 @@
 /// Composes a bug report that is sent via email.
 @interface ARKEmailBugReporter : NSObject <ARKBugReporter>
 
-- (nonnull instancetype)initWithEmailAddress:(nonnull NSString *)emailAddress logStore:(nonnull ARKLogStore *)logStore;
+- (nonnull instancetype)initWithEmailAddress:(nonnull NSString *)emailAddress logStore:(nonnull ARKLogStore *)logStore NS_DESIGNATED_INITIALIZER;
+
+- (nonnull instancetype)init NS_UNAVAILABLE;
++ (nonnull instancetype)new NS_UNAVAILABLE;
 
 /// The email address to which bug reports will be sent. Must be set before composeBugReport is called.
 @property (nonnull, nonatomic, copy) NSString *bugReportRecipientEmailAddress;