feat: remove no location product

Author: nickolas-dimitrakas

.github/workflows/build-and-lint.yml

@@ -42,15 +42,6 @@ jobs:
             -destination "generic/platform=iOS" \
             clean build | xcpretty
 
-      - name: Build SDK NoLocation
-        run: |
-          set -o pipefail
-          xcodebuild -resolvePackageDependencies \
-            -project "mParticle-Apple-Media-SDK.xcodeproj" \
-            -scheme "mParticle-Apple-Media-SDK-NoLocation" \
-            -destination "generic/platform=iOS" \
-            clean build | xcpretty
-
   run-analyzer:
     runs-on: macOS-15
     steps:

.github/workflows/pull-request.yml

@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         platform: [iOS]
-        scheme: [mParticle-Apple-Media-SDK, mParticle-Apple-Media-SDK-NoLocation]
+        scheme: [mParticle-Apple-Media-SDK]
         include:
           - platform: iOS
             device: iPhone 16 Pro

Package.swift

@@ -1,50 +1,30 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.5
 
 import PackageDescription
 
 let package = Package(
     name: "mParticle-Apple-Media-SDK",
-    platforms: [ .iOS(.v12), .tvOS(.v12) ],
+    platforms: [.iOS(.v15), .tvOS(.v15)],
     products: [
         .library(
             name: "mParticle-Apple-Media-SDK",
-            targets: ["mParticle-Apple-Media-SDK"]),
-        .library(
-            name: "mParticle-Apple-Media-SDK-NoLocation",
-            targets: ["mParticle-Apple-Media-SDK-NoLocation"]),
+            targets: ["mParticle-Apple-Media-SDK"])
     ],
     dependencies: [
-        .package(name: "mParticle-Apple-SDK",
-            url: "https://github.com/mParticle/mparticle-apple-sdk",
-            .upToNextMajor(from: "8.37.0")),
+        .package(url: "https://github.com/mParticle/mparticle-apple-sdk",
+                 branch: "workstation/9.0-Release")
     ],
     targets: [
         .target(
             name: "mParticle-Apple-Media-SDK",
             dependencies: [
-                .product(
-                   name: "mParticle-Apple-SDK",
-                   package: "mParticle-Apple-SDK"
-               )
+                .product(name: "mParticle-Apple-SDK",
+                         package: "mparticle-apple-sdk")
             ],
             path: "mParticle-Apple-Media-SDK",
             exclude: ["Info.plist"],
             resources: [.process("PrivacyInfo.xcprivacy")],
             publicHeadersPath: "."
-        ),
-        .target(
-            name: "mParticle-Apple-Media-SDK-NoLocation",
-            dependencies: [
-                .product(
-                   name: "mParticle-Apple-SDK-NoLocation",
-                   package: "mParticle-Apple-SDK"
-               ),
-            ],
-            path: "mParticle-Apple-Media-SDK-NoLocation",
-            exclude: ["Info.plist"],
-            resources: [.process("PrivacyInfo.xcprivacy")],
-            publicHeadersPath: ".",
-            cSettings: [.define("MP_NO_LOCATION")]
         )
     ]
 )

README.md

@@ -27,23 +27,16 @@ To integrate the Media SDK using CocoaPods, specify it in your Podfile:
 ```ruby
 target '<Your Target>' do
     pod 'mParticle-Apple-Media-SDK', '~> 1.0'
-    
-    # If you'd like to use a version of the Media SDK that doesn't include any location tracking
-    # nor links the CoreLocation framework, use this pod instead:
-    # pod 'mParticle-Apple-Media-SDK/mParticleMediaNoLocation', '~> 1.0'
 end
 ```
-Configuring your `Podfile` with the statement above will include only the _Core_ mParticle Media SDK.
 
 #### Swift Package Manager
 
 To integrate the SDK using Swift Package Manager, open your Xcode project and click on your project in the file list on the left, click on your Project name in the middle of the window, click on the "Package Dependencies" tab, and click the "+" button underneath the Packages list.
 
-Enter the repository URL `https://github.com/mParticle/mparticle-apple-media-sdk` in the search box on the top right, choose `mparticle-apple-media-sdk` from the list of pacakges, and change "Dependency Rule" to "Up to Next Major Version". Then click the "Add Package" button on the bottom right.
-
-Then choose either the "Package Product" called `mParticle-Apple-Media-SDK`, or if you'd like to use a version of the SDK that doesn't include any location tracking nor links the CoreLocation framework choose `mParticle-Apple-Media-SDK-NoLocation`.
+Enter the repository URL `https://github.com/mParticle/mparticle-apple-media-sdk` in the search box on the top right, choose `mparticle-apple-media-sdk` from the list of packages, and change "Dependency Rule" to "Up to Next Major Version". Then click the "Add Package" button on the bottom right.
 
-**IMPORTANT:** If you choose the `mParticle-Apple-Media-SDK-NoLocation` package product, you will need to import the SDK using `import mParticle_Apple_Media_SDK_NoLocation` instead of `import mParticle_Apple_Media_SDK` as shown in the rest of the documentation and this README. 
+Select the `mParticle-Apple-Media-SDK` package product and click "Add Package".
 
 ## Include and Initialize the SDK
 

mParticle-Apple-Media-SDK-NoLocation

@@ -1,9 +1,5 @@
 import UIKit
-#if canImport(mParticle_Apple_Media_SDK_NoLocation)
-import mParticle_Apple_SDK_NoLocation
-#else
 import mParticle_Apple_SDK
-#endif
 
 let MediaAttributeKeysMediaSessionId = "media_session_id"
 

mParticle-Apple-Media-SDK-Shared/MPMediaSDK.swift

@@ -15,32 +15,13 @@ Pod::Spec.new do |s|
 
     s.swift_version = '5.0'
 
-    s.ios.deployment_target = "12.0"
-    s.tvos.deployment_target = "12.0"
-    
-    s.default_subspecs = "mParticleMedia"
-    
-    # ---- mParticleMedia ----
-    s.subspec 'mParticleMedia' do |ss|
-        ss.source_files = [
-          'mParticle-Apple-Media-SDK-Shared/**/*.{h,m,mm,swift}'
-        ]
-        
-        ss.dependency 'mParticle-Apple-SDK/mParticle', '~> 8.37'
-    end
+    s.ios.deployment_target = "15.0"
+    s.tvos.deployment_target = "15.0"
 
-    # ---- NoLocation ----
-    s.subspec 'mParticleMediaNoLocation' do |ss|
-        ss.pod_target_xcconfig = {
-            'GCC_PREPROCESSOR_DEFINITIONS' => '$(inherited) MP_NO_LOCATION=1',
-            'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => '$(inherited) MP_NO_LOCATION'
-        }
+    s.source_files = [
+      'mParticle-Apple-Media-SDK-Shared/**/*.{h,m,mm,swift}'
+    ]
+
+    s.dependency 'mParticle-Apple-SDK', '~> 9.0'
 
-        ss.source_files = [
-          'mParticle-Apple-Media-SDK-Shared/**/*.{h,m,mm,swift}'
-        ]
-        
-        ss.dependency 'mParticle-Apple-SDK/mParticleNoLocation', '~> 8.37'
-    end
-    
 end