V4.1.10

.gitignore

@@ -22,6 +22,10 @@ DerivedData
 # Bundler
 .bundle
 
+# Swift Package Manager
+.build
+.swiftpm
+
 Carthage
 
 # CocoaPods typically recommends against ignoring the Pods directory
@@ -32,3 +36,4 @@ Carthage
 # itself has no pod dependencies, only our tests do.
 Pods/
 .clang-format
+.idea

Metarouter.xcodeproj/xcshareddata/xcschemes/Metarouter.xcscheme → Analytics.xcodeproj/xcshareddata/xcschemes/Segment.xcscheme

@@ -15,9 +15,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EADEB85A1DECD080005322DA"
-               BuildableName = "Metarouter.framework"
-               BlueprintName = "Metarouter"
-               ReferencedContainer = "container:Metarouter.xcodeproj">
+               BuildableName = "Analytics.framework"
+               BlueprintName = "Analytics"
+               ReferencedContainer = "container:Analytics.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -32,9 +32,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EADEB85A1DECD080005322DA"
-            BuildableName = "Metarouter.framework"
-            BlueprintName = "Metarouter"
-            ReferencedContainer = "container:Metarouter.xcodeproj">
+            BuildableName = "Analytics.framework"
+            BlueprintName = "Analytics"
+            ReferencedContainer = "container:Analytics.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <Testables>
@@ -43,9 +43,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EADEB8691DECD0EF005322DA"
-               BuildableName = "MetarouterTests.xctest"
-               BlueprintName = "MetarouterTests"
-               ReferencedContainer = "container:Metarouter.xcodeproj">
+               BuildableName = "AnalyticsTests.xctest"
+               BlueprintName = "AnalyticsTests"
+               ReferencedContainer = "container:Analytics.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>
@@ -64,9 +64,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EADEB85A1DECD080005322DA"
-            BuildableName = "Metarouter.framework"
-            BlueprintName = "Metarouter"
-            ReferencedContainer = "container:Metarouter.xcodeproj">
+            BuildableName = "Analytics.framework"
+            BlueprintName = "Analytics"
+            ReferencedContainer = "container:Analytics.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </LaunchAction>
@@ -80,9 +80,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EADEB85A1DECD080005322DA"
-            BuildableName = "Metarouter.framework"
-            BlueprintName = "Metarouter"
-            ReferencedContainer = "container:Metarouter.xcodeproj">
+            BuildableName = "Analytics.framework"
+            BlueprintName = "Analytics"
+            ReferencedContainer = "container:Analytics.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
    </ProfileAction>

Metarouter.xcodeproj/xcshareddata/xcschemes/MetarouterTests.xcscheme → Analytics.xcodeproj/xcshareddata/xcschemes/SegmentTests.xcscheme

@@ -15,9 +15,9 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "EADEB8691DECD0EF005322DA"
-            BuildableName = "MetarouterTests.xctest"
-            BlueprintName = "MetarouterTests"
-            ReferencedContainer = "container:Metarouter.xcodeproj">
+            BuildableName = "AnalyticsTests.xctest"
+            BlueprintName = "AnalyticsTests"
+            ReferencedContainer = "container:Analytics.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <EnvironmentVariables>
@@ -38,9 +38,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "EADEB8691DECD0EF005322DA"
-               BuildableName = "MetarouterTests.xctest"
-               BlueprintName = "MetarouterTests"
-               ReferencedContainer = "container:Metarouter.xcodeproj">
+               BuildableName = "AnalyticsTests.xctest"
+               BlueprintName = "AnalyticsTests"
+               ReferencedContainer = "container:Analytics.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>

Metarouter.xcodeproj/xcshareddata/xcschemes/MetarouterTestsTVOS.xcscheme → Analytics.xcodeproj/xcshareddata/xcschemes/SegmentTestsTVOS.xcscheme

@@ -18,9 +18,9 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "9D8CE58B23EE014E00197D0C"
-               BuildableName = "MetarouterTestsTVOS.xctest"
-               BlueprintName = "MetarouterTestsTVOS"
-               ReferencedContainer = "container:Metarouter.xcodeproj">
+               BuildableName = "SegmentTestsTVOS.xctest"
+               BlueprintName = "SegmentTestsTVOS"
+               ReferencedContainer = "container:Analytics.xcodeproj">
             </BuildableReference>
          </TestableReference>
       </Testables>

CHANGELOG.md

@@ -1,7 +1,22 @@
 Change Log
 ==========
-Version 4.1.5 *(2 July, 2021)*
-* [Fix] Apply Metarouter branding
+Version 4.2.0 *(22 December, 2021)*
+-----------------------------
+* [Fix] Removed unnecessary renames so syncing with upstream is simpler
+
+Version 4.1.9 *(2 November, 2021)*
+-----------------------------
+* [New] Updated codebase with upstream (4.1.6 version)
+
+Version 4.1.8 *(9 July, 2021)*
+-----------------------------
+* [New] Updated codebase with upstream
+
+Version 4.1.5 *(9 July, 2021)*
+-----------------------------
+* [Fix](https://github.com/segmentio/analytics-ios/pull/999) Add missing nullability identifier 
+* [Fix](https://github.com/segmentio/analytics-ios/pull/1002) Update Readme with SPM guide 
+
 Version 4.1.4 *(3 May, 2021)*
 -----------------------------
 * [Fix](https://github.com/segmentio/analytics-ios/pull/994) Add missing import in Segment.h for Xcode 12.5
@@ -554,4 +569,4 @@ Version 3.0.3-alpha *(10-21-2015)*
 Version 3.0.2-alpha *(10-11-2015)*
 ----------------------------------
 
- * Fixes `pod lib lint` warnings.
+ * Fixes `pod lib lint` warnings.

Examples/CarthageExample/Cartfile

@@ -1,3 +1,3 @@
-github "segmentio/analytics-ios" "4.1.6"
+github "segmentio/analytics-ios" "4.1.10"
 # Use a local project when debugging
 # git "~/Code/segmentio/analytics-ios/" "master"

Makefile

@@ -1,4 +1,4 @@
-XC_ARGS := -project Segment.xcodeproj GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
+XC_ARGS := -project Analytics.xcodeproj GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES
 IOS_XCARGS := $(XC_ARGS) -destination "platform=iOS Simulator,name=iPhone 11" -sdk iphonesimulator
 TVOS_XCARGS := $(XC_ARGS) -destination "platform=tvOS Simulator,name=Apple TV"
 MACOS_XCARGS := $(XC_ARGS) -destination "platform=macOS"

MetarouterAnalytics.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name             = "MetarouterAnalytics"
   s.module_name      = "Metarouter"
-  s.version          = "4.1.7"
+  s.version          = "4.1.10"
   s.summary          = "The hassle-free way to add analytics to your iOS app."
 
   s.description      = <<-DESC
@@ -12,15 +12,15 @@ Pod::Spec.new do |s|
   s.homepage         = "http://metarouter.io/"
   s.license          =  { :type => 'MIT' }
   s.author           = { "Astronomer" => "[email protected]" }
-  s.source           = { :git => "https://github.com/metarouter/analytics-ios.git", :tag => s.version.to_s }
+  s.source           = { :git => "https://github.com/metarouterio/analytics-ios.git", :tag => s.version.to_s }
   s.social_media_url = 'https://twitter.com/metarouter'
 
   s.ios.deployment_target = '10.0'
   s.tvos.deployment_target = '10.0'
   s.osx.deployment_target = '10.13'
 
   s.source_files = [
-    'Metarouter/Classes/**/*.{h,m}',
-    'Metarouter/Internal/**/*.{h,m}'
+    'Segment/Classes/**/*.{h,m}',
+    'Segment/Internal/**/*.{h,m}'
   ]
-end
+end

Package.swift

@@ -24,8 +24,7 @@ let package = Package(
         .target(
             name: "Metarouter",
             dependencies: [],
-            path: "Metarouter/",
-            exclude: ["SwiftSources"],
+            path: "Segment/",
             sources: ["Classes", "Internal"],
             publicHeadersPath: "Classes",
             cSettings: [
@@ -34,4 +33,4 @@ let package = Package(
             ]
         )
     ]
-)
+)

README.md

@@ -89,4 +89,4 @@ Refer to the Quickstart documentation at [https://docs.metarouter.io/docs/quick-
 
 ## Documentation
 
-More detailed documentation is available at [https://docs.metarouter.io/docs/analyticsjs-for-ios](https://docs.metarouter.io/docs/analyticsjs-for-ios).
+More detailed documentation is available at [https://docs.metarouter.io/docs/analyticsjs-for-ios](https://docs.metarouter.io/docs/analyticsjs-for-ios).

RELEASING.md

@@ -1,12 +1,12 @@
 Releasing
 =========
 
- 1. Update the version in `SEGAnalytics.m`, `Analytics.podspec`, `Segment/Info.plist` and `Examples/CarthageExample/Cartfile` to the next release version.
+ 1. Update the version in `SEGAnalytics.m`, `MetarouterAnalytics.podspec` and `Examples/CarthageExample/Cartfile` to the next release version.
  2. Update the `CHANGELOG.md` for the impending release.
  3. `git commit -am "Prepare for release X.Y.Z."` (where X.Y.Z is the new version).
  4. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version).
  5. `git push && git push --tags`.
- 6. `pod trunk push Analytics.podspec`.
+ 6. `pod trunk push MetarouterAnalytics.podspec`.
  7. Next we'll create a dynamic framework for manual installation leveraging Carthage.
      * `cd Examples/CarthageExample`.
      * `make clean` to be safe then `make build`.

Metarouter/Classes/SEGAnalytics.m → Segment/Classes/SEGAnalytics.m

@@ -53,7 +53,7 @@ - (instancetype)initWithConfiguration:(SEGAnalyticsConfiguration *)configuration
         // In swift this would not have been OK... But hey.. It's objc
         // TODO: Figure out if this is really the best way to do things here.
         self.integrationsManager = [[SEGIntegrationsManager alloc] initWithAnalytics:self];
-        
+
         self.runner = [[SEGMiddlewareRunner alloc] initWithMiddleware:
                                                        [configuration.sourceMiddleware ?: @[] arrayByAddingObject:self.integrationsManager]];
 
@@ -110,7 +110,7 @@ - (instancetype)initWithConfiguration:(SEGAnalyticsConfiguration *)configuration
             }
         }
 #endif
-        
+
         [SEGState sharedInstance].configuration = configuration;
         [[SEGState sharedInstance].context updateStaticContext];
     }
@@ -229,7 +229,7 @@ - (void)_applicationWillEnterForeground
         @"version" : currentVersion ?: @"",
         @"build" : currentBuild ?: @"",
     }];
-    
+
     [[SEGState sharedInstance].context updateStaticContext];
 }
 
@@ -270,7 +270,7 @@ - (void)identify:(NSString *)userId traits:(NSDictionary *)traits
 - (void)identify:(NSString *)userId traits:(NSDictionary *)traits options:(NSDictionary *)options
 {
     NSCAssert2(userId.length > 0 || traits.count > 0, @"either userId (%@) or traits (%@) must be provided.", userId, traits);
-    
+
     // this is done here to match functionality on android where these are inserted BEFORE being spread out amongst destinations.
     // it will be set globally later when it runs through SEGIntegrationManager.identify.
     NSString *anonId = [options objectForKey:@"anonymousId"];
@@ -297,7 +297,7 @@ - (void)identify:(NSString *)userId traits:(NSDictionary *)traits options:(NSDic
     // merge w/ existing traits and set them.
     [existingTraitsCopy addEntriesFromDictionary:traitsCopy];
     [SEGState sharedInstance].userInfo.traits = existingTraitsCopy;
-    
+
     [self run:SEGEventTypeIdentify payload:
                                        [[SEGIdentifyPayload alloc] initWithUserId:userId
                                                                       anonymousId:anonId
@@ -483,7 +483,7 @@ - (void)openURL:(NSURL *)url options:(NSDictionary *)options
     if (!self.oneTimeConfiguration.trackDeepLinks) {
         return;
     }
-    
+
     NSString *urlString = url.absoluteString;
     [SEGState sharedInstance].context.referrer = @{
         @"url" : urlString,
@@ -549,7 +549,7 @@ + (NSString *)version
 {
     // this has to match the actual version, NOT what's in info.plist
     // because Apple only accepts X.X.X as versions in the review process.
-    return @"4.1.4";
+    return @"4.1.10";
 }
 
 #pragma mark - Helpers
@@ -559,7 +559,7 @@ - (void)run:(SEGEventType)eventType payload:(SEGPayload *)payload
     if (!self.enabled) {
         return;
     }
-    
+
     if (getAdTrackingEnabled(self.oneTimeConfiguration)) {
         // if idfa has changed since last we looked, we need to rebuild
         // the static context to pick up the change.
@@ -569,13 +569,13 @@ - (void)run:(SEGEventType)eventType payload:(SEGPayload *)payload
             [[SEGState sharedInstance].context updateStaticContext];
         }
     }
-    
+
     if (self.oneTimeConfiguration.experimental.nanosecondTimestamps) {
         payload.timestamp = iso8601NanoFormattedString([NSDate date]);
     } else {
         payload.timestamp = iso8601FormattedString([NSDate date]);
     }
-    
+
     SEGContext *context = [[[SEGContext alloc] initWithAnalytics:self] modify:^(id<SEGMutableContext> _Nonnull ctx) {
         ctx.eventType = eventType;
         ctx.payload = payload;
@@ -587,7 +587,7 @@ - (void)run:(SEGEventType)eventType payload:(SEGPayload *)payload
             ctx.payload.anonymousId = [SEGState sharedInstance].userInfo.anonymousId;
         }
     }];
-    
+
     // Could probably do more things with callback later, but we don't use it yet.
     [self.runner run:context callback:nil];
 }

Metarouter/Classes/SEGAnalyticsConfiguration.h → Segment/Classes/SEGAnalyticsConfiguration.h

@@ -54,7 +54,7 @@ NS_SWIFT_NAME(AnalyticsConfiguration)
 
 /**
  * Creates and returns a configuration with default settings and the given write key.
- * This will use the API host `https://e.metarouter.io/v1` as the default.
+ * This will use the API host `https://api.segment.io/v1` as the default.
  *
  * @param writeKey Your project's write key from segment.io.
  */