Merge pull request #9 from NimbleDroid/1.2.0

Support custom TimeInterval bookends
NimbleDroid · Mar 20, 2021 · 75f716f · 75f716f
2 parents aef2979 + 243b98b
commit 75f716f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/NimbleDroid.podspec b/NimbleDroid.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name = 'NimbleDroid'
-  s.version = '1.1.0'
+  s.version = '1.2.0'
   s.summary = 'Functional performance testing using NimbleDroid'
   s.homepage = 'https://github.com/NimbleDroid/NimbleDroid-iOS'
   s.license = 'None'
@@ -18,5 +18,4 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.swift_version = '4.0'
   s.source_files = 'NimbleDroid/*.{h,swift}'
-  s.social_media_url = 'https://twitter.com/NimbleDroid'
 end
diff --git a/NimbleDroid.xcodeproj/project.pbxproj b/NimbleDroid.xcodeproj/project.pbxproj
@@ -109,6 +109,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = E23F937E1EC12F3000296150;

diff --git a/NimbleDroid/Info.plist b/NimbleDroid/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/NimbleDroid/NimbleDroid.swift b/NimbleDroid/NimbleDroid.swift
@@ -41,28 +41,36 @@ public class NDScenario : NSObject {
         NSLog("NDScenario is not initialized, please call setup in application:willFinishLaunchingWithOptions:")
     }
 
-    @objc public class func begin(bookendID : String) {
+    @objc public class func begin(bookendID : String, timeInterval : TimeInterval) {
         if !initialized {
             warnSetup()
         }
-        NSLog("NDScenario.begin %@ %f", bookendID, NSDate.init().timeIntervalSince1970 * 1000000)
+        NSLog("NDScenario.begin %@ %f", bookendID, timeInterval * 1000000)
         fflush(stderr)
         if bookendID == scenario {
             raise(SIGSTOP)
         }
     }
 
-    @objc public class func end(bookendID : String) {
+    @objc public class func begin(bookendID : String) {
+        begin(bookendID: bookendID, timeInterval: NSDate.init().timeIntervalSince1970)
+    }
+
+    @objc public class func end(bookendID : String, timeInterval : TimeInterval) {
         if !initialized {
             warnSetup()
         }
-        NSLog("NDScenario.end %@ %f", bookendID, NSDate.init().timeIntervalSince1970 * 1000000)
+        NSLog("NDScenario.end %@ %f", bookendID, timeInterval * 1000000)
         fflush(stderr)
         if bookendID == scenario {
             raise(SIGSTOP)
         }
     }
 
+    @objc public class func end(bookendID : String) {
+        end(bookendID: bookendID, timeInterval: NSDate.init().timeIntervalSince1970)
+    }
+
     @objc public class func coldStartupEnd() {
         if !initialized {
             warnSetup()