From e072cd3e987692796199cf293732eed81ed56dd0 Mon Sep 17 00:00:00 2001 From: andrew-tran-infillion <102556507+andrew-tran-infillion@users.noreply.github.com> Date: Tue, 18 Oct 2022 16:17:28 -0700 Subject: [PATCH] Feature/loc 505 pod deployment (#2) * Rename podspec and class file to match. * Update Gimbal dependency and fix naming issue. Update Gimbal dependency version to 2.92.1. Update architecture exclusions to match that of new Gimbal dependency version. Fix AirshipGimbal classname usage. * Update Airship dependency version to 16.9.4. Co-authored-by: Andrew Tran --- ...Adapter.podspec => GimbalAirshipAdapter.podspec | 14 ++++++++------ ...hipAdapter.swift => GimbalAirshipAdapter.swift} | 14 +++++++------- 2 files changed, 15 insertions(+), 13 deletions(-) rename AirshipGimbalAdapter.podspec => GimbalAirshipAdapter.podspec (61%) rename Pod/Classes/{AirshipAdapter.swift => GimbalAirshipAdapter.swift} (93%) diff --git a/AirshipGimbalAdapter.podspec b/GimbalAirshipAdapter.podspec similarity index 61% rename from AirshipGimbalAdapter.podspec rename to GimbalAirshipAdapter.podspec index 898b22f..d03086c 100644 --- a/AirshipGimbalAdapter.podspec +++ b/GimbalAirshipAdapter.podspec @@ -3,17 +3,19 @@ Pod::Spec.new do |s| s.version = "1.0.0" s.name = "GimbalAirshipAdapter" s.summary = "An adapter for integrating Gimbal place events with Airship." - s.documentation_url = "https://github.com/gimbalinc/ios-airship-adapter" + s.documentation_url = "https://github.com/gimbalinc/airship-adapter-ios" s.homepage = "https://infillion.com/commerce/gimbal/" s.author = { "Gimbal" => "support@infillion.com" } s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } - s.source = { :git => "https://github.com/PaeDae/ios-airship-adapter.git", :tag => s.version.to_s } + s.source = { :git => "https://github.com/gimbalinc/airship-adapter-ios.git", :tag => s.version.to_s } s.ios.deployment_target = "11.0" s.swift_version = "5.0" s.source_files = "Pod/Classes/*" s.requires_arc = true - s.dependency "GimbalXCFramework", "~> 2.85" - s.dependency "Airship", "~> 16.1" - s.pod_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64'} - s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' } + s.dependency "GimbalXCFramework", "~> 2.92.1" + s.dependency "Airship", "~> 16.9.4" + s.pod_target_xcconfig = { + 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' + } + s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386' } end \ No newline at end of file diff --git a/Pod/Classes/AirshipAdapter.swift b/Pod/Classes/GimbalAirshipAdapter.swift similarity index 93% rename from Pod/Classes/AirshipAdapter.swift rename to Pod/Classes/GimbalAirshipAdapter.swift index 98b186e..998043c 100644 --- a/Pod/Classes/AirshipAdapter.swift +++ b/Pod/Classes/GimbalAirshipAdapter.swift @@ -17,7 +17,7 @@ fileprivate let shouldTrackRegionEventsKey = "gmbl_should_track_region_events" /** * Singleton access. */ - @objc public static let shared = AirshipGimbalAdapter() + @objc public static let shared = AirshipAdapter() #if !targetEnvironment(simulator) @@ -109,7 +109,7 @@ fileprivate let shouldTrackRegionEventsKey = "gmbl_should_track_region_events" } NotificationCenter.default.addObserver(self, - selector: #selector(AirshipGimbalAdapter.updateDeviceAttributes), + selector: #selector(AirshipAdapter.updateDeviceAttributes), name: Channel.channelCreatedEvent, object: nil) } @@ -200,27 +200,27 @@ private class AirshipGimbalDelegate : NSObject, PlaceManagerDelegate { func placeManager(_ manager: PlaceManager, didBegin visit: Visit) { trackPlaceEventFor(visit, boundaryEvent: .enter) - AirshipGimbalAdapter.shared.delegate?.placeManager?(manager, didBegin: visit) + AirshipAdapter.shared.delegate?.placeManager?(manager, didBegin: visit) } func placeManager(_ manager: PlaceManager, didBegin visit: Visit, withDelay delayTime: TimeInterval) { trackPlaceEventFor(visit, boundaryEvent: .enter) - AirshipGimbalAdapter.shared.delegate?.placeManager?(manager, didBegin: visit, withDelay: delayTime) + AirshipAdapter.shared.delegate?.placeManager?(manager, didBegin: visit, withDelay: delayTime) } func placeManager(_ manager: PlaceManager, didEnd visit: Visit) { trackPlaceEventFor(visit, boundaryEvent: .exit) - AirshipGimbalAdapter.shared.delegate?.placeManager?(manager, didEnd: visit) + AirshipAdapter.shared.delegate?.placeManager?(manager, didEnd: visit) } func placeManager(_ manager: PlaceManager, didReceive sighting: BeaconSighting, forVisits visits: [Any]) { - AirshipGimbalAdapter.shared.delegate?.placeManager?(manager, didReceive: sighting, forVisits: visits) + AirshipAdapter.shared.delegate?.placeManager?(manager, didReceive: sighting, forVisits: visits) } func placeManager(_ manager: PlaceManager, didDetect location: CLLocation) { - AirshipGimbalAdapter.shared.delegate?.placeManager?(manager, didDetect: location) + AirshipAdapter.shared.delegate?.placeManager?(manager, didDetect: location) } private func trackPlaceEventFor(_ visit: Visit, boundaryEvent: UABoundaryEvent) {