2.5.0 Release (#5)

Co-authored-by: Nimbus Deploy <[email protected]>

Package.swift

@@ -1,152 +1,156 @@
 // swift-tools-version: 5.6
 
+import Foundation
 import PackageDescription
 
 let package = Package(
     name: "NimbusSDK",
     platforms: [.iOS(.v12)],
     products: [
         .library(
-            name: "NimbusKit",
-            targets: ["NimbusTarget"]),
+           name: "NimbusKit",
+           targets: ["NimbusTarget"]),
         .library(
-            name: "NimbusRenderKit",
-            targets: ["NimbusRenderTarget"]),
+           name: "NimbusRenderKit",
+           targets: ["NimbusRenderTarget", "OMSDK_Adsbynimbus"]),
         .library(
-            name: "NimbusRenderStaticKit",
-            targets: ["NimbusRenderStaticTarget"]),
+           name: "NimbusRenderStaticKit",
+           targets: ["NimbusRenderStaticTarget"]),
         .library(
-            name: "NimbusRenderVideoKit",
-            targets: ["NimbusRenderVideoTarget", "GoogleInteractiveMediaAds"]),
+           name: "NimbusRenderVideoKit",
+           targets: ["NimbusRenderVideoTarget", "GoogleInteractiveMediaAds"]),
         .library(
-            name: "NimbusRequestKit",
-            targets: ["NimbusRequestTarget"]),
+           name: "NimbusRequestKit",
+           targets: ["NimbusRequestTarget"]),
         .library(
-            name: "NimbusGAMKit",
-            targets: ["NimbusGAMKit"]),
+           name: "NimbusGAMKit",
+           targets: ["NimbusGAMKit"]),
         .library(
-            name: "NimbusFANKit",
-            targets: ["NimbusFANKit", "FBAudienceNetwork"]),
+           name: "NimbusFANKit",
+           targets: ["NimbusRenderFANKit", "NimbusRequestFANKit", "FBAudienceNetwork"]),
         .library(
-            name: "NimbusLiveRampKit",
-            targets: ["NimbusLiveRampKit"]),
+           name: "NimbusLiveRampKit",
+           targets: ["NimbusLiveRampKit"]),
         .library(
-            name: "NimbusRequestAPSKit",
-            targets: ["NimbusRequestAPSKit", "DTBiOSSDK"]),
+           name: "NimbusRequestAPSKit",
+           targets: ["NimbusRequestAPSKit", "DTBiOSSDK"]),
         .library(
-            name: "NimbusUnityKit",
-            targets: ["NimbusUnityKit", "UnityAds"]),
+           name: "NimbusUnityKit",
+           targets: ["NimbusUnityKit", "UnityAds"]),
         .library(
-            name: "NimbusRenderVideoKit-WithoutGoogleInteractiveMediaAds",
-            targets: ["NimbusRenderVideoTarget"]),
+           name: "NimbusRenderVideoKit-WithoutGoogleInteractiveMediaAds",
+           targets: ["NimbusRenderVideoTarget"]),
         .library(
-            name: "NimbusRequestAPSKit-WithoutDTBiOSSDK",
-            targets: ["NimbusRequestAPSKit"]),
+           name: "NimbusRequestAPSKit-WithoutDTBiOSSDK",
+           targets: ["NimbusRequestAPSKit"]),
         .library(
-            name: "NimbusFANKit-WithoutFBAudienceNetwork",
-            targets: ["NimbusFANKit"]),
+           name: "NimbusFANKit-WithoutFBAudienceNetwork",
+           targets: ["NimbusRenderFANKit", "NimbusRequestFANKit"]),
         .library(
-            name: "NimbusUnityKit-WithoutUnityAds",
-            targets: ["NimbusUnityKit"]),
+           name: "NimbusUnityKit-WithoutUnityAds",
+           targets: ["NimbusUnityKit"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/faktorio/ats-sdk-ios-prod", from: "1.4.0"),
-        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads", "9.12.0"..<"11.0.0"),
+        .package(url: "https://github.com/LiveRamp/ats-sdk-ios.git", from: "1.4.0"),
+        .package(url: "https://github.com/birdrides/mockingbird.git", from: "0.20.0"),
+        .package(url: "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", "9.12.0"..<"11.0.0"),
     ],
     targets: [
-        .target(
+        .framework(
             name: "NimbusRenderTarget",
-            dependencies: ["NimbusRenderKit", "NimbusCoreKit", "OMSDK_Adsbynimbus"]),
-        .target(
+            dependencies: ["NimbusCoreKit", "NimbusRenderKit"]),
+        .framework(
+            name: "NimbusRequestTarget",
+            dependencies: ["NimbusCoreKit", "NimbusRequestKit"]),
+        .framework(
+            name: "NimbusTarget",
+            dependencies: ["NimbusRequestTarget", "NimbusRenderTarget", "NimbusKit"]),
+        .framework(
             name: "NimbusRenderStaticTarget",
-            dependencies: ["NimbusRenderStaticKit", "NimbusRenderTarget"]),
-        .target(
+            dependencies: ["NimbusRenderTarget", "NimbusRenderStaticKit"]),
+        .framework(
             name: "NimbusRenderVideoTarget",
-            dependencies: ["NimbusRenderVideoKit", "NimbusRenderTarget"]),
+            dependencies: ["NimbusRenderTarget", "NimbusRenderVideoKit"]),
         .target(
-            name: "NimbusRequestTarget",
-            dependencies: ["NimbusRequestKit", "NimbusCoreKit"]),
+            name: "NimbusRenderFANKit",
+            dependencies: ["NimbusRenderTarget"]),
         .target(
-            name: "NimbusTarget",
-            dependencies: ["NimbusKit", "NimbusRequestTarget", "NimbusRenderTarget"]),
+            name: "NimbusRequestFANKit",
+            dependencies: ["NimbusRequestTarget"]),
         .target(
             name: "NimbusGAMKit",
-            dependencies: [
-                "NimbusTarget",
-                .product(name: "GoogleMobileAds", package: "swift-package-manager-google-mobile-ads")]),
-        .testTarget(
-            name: "NimbusGAMKitTests",
-            dependencies: ["NimbusGAMKit"]),
+            dependencies: ["NimbusTarget", .GoogleMobileAds]),
         .target(
             name: "NimbusLiveRampKit",
-            dependencies: [
-                "NimbusRequestKit",
-                .product(name: "LRAtsSDK", package: "ats-sdk-ios-prod")]),
-        .testTarget(
-            name: "NimbusLiveRampKitTests",
-            dependencies: ["NimbusLiveRampKit"]),
-        .target(
-            name: "NimbusFANKit",
-            dependencies: ["NimbusRenderTarget", "NimbusRequestTarget"]),
-        .testTarget(
-            name: "NimbusFANKitTests",
-            dependencies: ["NimbusFANKit", "FBAudienceNetwork"]),
+            dependencies: [ "NimbusRequestTarget", .LiveRamp]),
         .target(
             name: "NimbusRequestAPSKit",
             dependencies: ["NimbusRequestTarget"]),
-        .testTarget(
-            name: "NimbusRequestAPSKitTests",
-            dependencies: ["NimbusRequestAPSKit", "DTBiOSSDK"]),
         .target(
             name: "NimbusUnityKit",
             dependencies: ["NimbusRenderTarget", "NimbusRequestTarget"]),
-        .testTarget(
-            name: "NimbusUnityKitTests",
-            dependencies: ["NimbusUnityKit", "UnityAds"]),
-        .binaryTarget(
-            name: "NimbusKit",
-            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.4.1/NimbusKit-2.4.1.zip",
-            checksum: "27db7850b35ae871ded3430be503ac6555a31b58eab75670552b525be7368949"),
-        .binaryTarget(
-            name: "NimbusRequestKit",
-            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.4.1/NimbusRequestKit-2.4.1.zip",
-            checksum: "78edbea655de6ca6eb1b12c06224095f54ccc8f29b166a27a9fa522b6e673750"),
-        .binaryTarget(
-            name: "NimbusRenderKit",
-            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.4.1/NimbusRenderKit-2.4.1.zip",
-            checksum: "00b877ba91d521fcb855f4a830102153ed28e5bee2cc08160e3cc24d523de70c"),
-        .binaryTarget(
-            name: "NimbusRenderStaticKit",
-            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.4.1/NimbusRenderStaticKit-2.4.1.zip",
-            checksum: "bf340e302256f99c6f5dd52243bca9d0a030748bcaab0733f9789970591b390f"),
-        .binaryTarget(
-            name: "NimbusRenderVideoKit",
-            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.4.1/NimbusRenderVideoKit-2.4.1.zip",
-            checksum: "24140b2623155cb0dbc48e2a3e35f94db38c8f4361c0357be788553b574a9421"),
-        .binaryTarget(
-            name: "NimbusCoreKit",
-            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.4.1/NimbusCoreKit-2.4.1.zip",
-            checksum: "2dcc6bc37a11cebadc736eb3d519e27db9c8c41a413ad7c4f77cdb21cd00316b"),
         .binaryTarget(
             name: "GoogleInteractiveMediaAds",
             url: "https://imasdk.googleapis.com/native/downloads/ima-ios-v3.16.3.zip",
             checksum: "049bac92551b50247ea14dcbfde9aeb99ac2bea578a74f67c6f3e781d9aca101"),
         .binaryTarget(
             name: "OMSDK_Adsbynimbus",
-            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/external/omsdk/1.4.2/OMSDK_Adsbynimbus-1.4.2.zip",
-            checksum: "c92acd23f1cec2c3418ae9f5b01c0dcc9aa4abaf3cfc7cd12de3aa4ed6c2b785"),
+            url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/external/omsdk/1.4.2/omsdk-adsbynimbus-1.4.2.zip",
+            checksum: "d42443a5d19a34418976945d8afcd11f25d471fa3178f80eba1c3f6035c0ad24"),
         .binaryTarget(
             name: "DTBiOSSDK",
             url: "https://mdtb-sdk-packages.s3.us-west-2.amazonaws.com/iOS_APS_SDK/APS_iOS_SDK-4.5.5.zip",
             checksum: "0aaf4f92ace01441501f45a9d7fd4614d5e496ab925f6b84b4a1d96e9a65ba29"),
         .binaryTarget(
             name: "FBAudienceNetwork",
             url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/external/facebook/6.12.0/FBAudienceNetwork.zip",
-            checksum: "4bf37ee5949de007349d85b069da1095a30e82e696e72642dfe117aba08a86a2"
-        ),
+            checksum: "4bf37ee5949de007349d85b069da1095a30e82e696e72642dfe117aba08a86a2"),
         .binaryTarget(
             name: "UnityAds",
             url: "https://github.com/Unity-Technologies/unity-ads-ios/releases/download/4.4.1/UnityAds.zip",
             checksum: "8196b13a0a5eae6ba817e2e7fc9096a584f22aedb1958980d2064955e448d5ad"),
     ]
 )
+
+extension Target {
+    static func framework(name: String, dependencies: [Target.Dependency]) -> Target {
+        target(
+            name: name,
+            dependencies: dependencies,
+            path: "Sources/\(name.replacingOccurrences(of: "Target", with: "Kit"))",
+            sources: ["Export.swift"])
+    }
+}
+
+extension Target.Dependency {
+    static let GoogleMobileAds = product(name: "GoogleMobileAds", package: "swift-package-manager-google-mobile-ads")
+    static let LiveRamp = product(name: "LRAtsSDK", package: "ats-sdk-ios")
+    static let MockingBird = product(name: "Mockingbird", package: "Mockingbird")
+}
+
+package.targets += [
+    .binaryTarget(
+        name: "NimbusCoreKit",
+        url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.5.0/NimbusCoreKit-2.5.0.zip",
+        checksum: "709d1c76a1a96f9021d63db1eea102fa48343f1b4b3e54cfdf7714e3ef651697"),
+    .binaryTarget(
+        name: "NimbusKit",
+        url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.5.0/NimbusKit-2.5.0.zip",
+        checksum: "5047181243a06ddffe92a25d3af27b2e2325b74f3f385c718edfd8ebbb0fdac3"),
+    .binaryTarget(
+        name: "NimbusRenderKit",
+        url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.5.0/NimbusRenderKit-2.5.0.zip",
+        checksum: "39b0362bc659aaf100cd5097201c6664abfd1e628f41c8869d6cf3250efb9aa0"),
+    .binaryTarget(
+        name: "NimbusRenderStaticKit",
+        url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.5.0/NimbusRenderStaticKit-2.5.0.zip",
+        checksum: "61aab44a872c5020fe582304c7d8db008ee14294a61a2aa539f35c4e05881964"),
+    .binaryTarget(
+        name: "NimbusRenderVideoKit",
+        url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.5.0/NimbusRenderVideoKit-2.5.0.zip",
+        checksum: "5559cde580e0ef491297d5c31e13ad942d725b6fd987f9d6cef6fc962ef34c24"),
+    .binaryTarget(
+        name: "NimbusRequestKit",
+        url: "https://adsbynimbus-public.s3.amazonaws.com/iOS/sdks/2.5.0/NimbusRequestKit-2.5.0.zip",
+        checksum: "8360a5c4e81bd89cc6493fcad0b1f85397a3d93faa118f50097a2a4c34a33dc4"),
+]

Sources/NimbusGAMKit/Line Items/NimbusAd+Targeting.swift

@@ -6,11 +6,12 @@
 //  Copyright © 2022 Timehop. All rights reserved.
 //
 
-import GoogleMobileAds
 @_exported import NimbusRequestKit
+import GoogleMobileAds
 
 public extension NimbusAd {
-
+
+
     /// Add keywords for custom targeting from Nimbus ad to GAMRequest
     /// - Parameters:
     ///   - request: GAMRequest to add keywords to

Sources/NimbusGAMKit/Line Items/NimbusGAMDynamicPrice.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2020 Timehop. All rights reserved.
 //
 
-import GoogleMobileAds
 @_exported import NimbusRequestKit
+import GoogleMobileAds
 
 /// Nimbus Dynamice Price implementation for GAM which applies keywords to a `GADRequest`
 public class NimbusGAMDynamicPrice {

Sources/NimbusGAMKit/Line Items/NimbusGAMLinearPriceMapping.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2020 Timehop. All rights reserved.
 //
 
-import Foundation
 @_exported import NimbusRequestKit
+import Foundation
 
 /// A mapping composed of multiple LinearPriceGranularities in ascending order
 public struct NimbusGAMLinearPriceMapping: NimbusDynamicPriceMapping {

Sources/NimbusGAMKit/Mediation/NimbusCustomEventBanner.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2020 Timehop. All rights reserved.
 //
 
+@_exported import NimbusKit
 import GoogleMobileAds
-import NimbusKit
 
 /// :nodoc:
 public final class NimbusCustomEventBanner: NSObject, GADCustomEventBanner {
@@ -84,7 +84,6 @@ extension NimbusCustomEventBanner: AdControllerDelegate {
     public func didReceiveNimbusEvent(controller: AdController, event: NimbusEvent) {
         if event == .clicked {
             delegate?.customEventBannerWasClicked(self)
-            delegate?.customEventBannerWillLeaveApplication(self)
         }
     }
 

Sources/NimbusGAMKit/Mediation/NimbusCustomEventInterstitial.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2020 Timehop. All rights reserved.
 //
 
+@_exported import NimbusKit
 import GoogleMobileAds
-import NimbusKit
 
 /// :nodoc:
 public final class NimbusCustomEventInterstitial: NSObject, GADCustomEventInterstitial {
@@ -77,7 +77,6 @@ extension NimbusCustomEventInterstitial: AdControllerDelegate {
     public func didReceiveNimbusEvent(controller: AdController, event: NimbusEvent) {
         if event == .clicked {
             delegate?.customEventInterstitialWasClicked(self)
-            delegate?.customEventInterstitialWillLeaveApplication(self)
         }
     }
 

Sources/NimbusGAMKit/Mediation/NimbusSizeToFormatMapper.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2022 Timehop. All rights reserved.
 //
 
-import NimbusRequestKit
+@_exported import NimbusRequestKit
 
 final class NimbusSizeToFormatMapper {
 

Sources/NimbusKit/Export.swift

@@ -0,0 +1,7 @@
+//
+//  Export.swift
+//
+//  DO NOT REMOVE THIS FILE, it is used with Swift Packager Manager to fix Dependency Resolution
+//
+//  Created by Jason Sznol on 3/14/23.
+//

Sources/NimbusLiveRampKit/NimbusLiveRampInterceptor.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2022 Timehop. All rights reserved.
 //
 
-import LRAtsSDK
 @_exported import NimbusRequestKit
+import LRAtsSDK
 
 /// Delegate for listening LiveRamp's initialization and envelope fetching
 public protocol NimbusLiveRampInterceptorDelegate {

Sources/NimbusLiveRampKit/Resources/NimbusLiveRampKit.h

@@ -0,0 +1,16 @@
+//
+//  NimbusLiveRampKit.h
+//  NimbusLiveRampKit
+//
+//  Created by Victor Takai on 20/07/22.
+//  Copyright © 2022 Timehop. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <NimbusRequestKit/NimbusRequestKit.h>
+
+//! Project version number for NimbusLiveRampKit.
+FOUNDATION_EXPORT double NimbusLiveRampKitVersionNumber;
+
+//! Project version string for NimbusLiveRampKit.
+FOUNDATION_EXPORT const unsigned char NimbusLiveRampKitVersionString[];

Sources/NimbusFANKit/NimbusFANAdController.swift → Sources/NimbusRenderFANKit/NimbusFANAdController.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2020 Timehop. All rights reserved.
 //
 
-import FBAudienceNetwork
 @_exported import NimbusRenderKit
+import FBAudienceNetwork
 
 final class NimbusFANAdController: NSObject {
 

Sources/NimbusFANKit/NimbusFANAdRenderer.swift → Sources/NimbusRenderFANKit/NimbusFANAdRenderer.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2020 Timehop. All rights reserved.
 //
 
-import FBAudienceNetwork
 @_exported import NimbusRenderKit
+import FBAudienceNetwork
 
 public protocol NimbusFANAdRendererDelegate: AnyObject {
     /**

Sources/NimbusRenderKit/Export.swift

@@ -0,0 +1,7 @@
+//
+//  Export.swift
+//
+//  DO NOT REMOVE THIS FILE, it is used with Swift Packager Manager to fix Dependency Resolution
+//
+//  Created by Jason Sznol on 3/14/23.
+//