Skip to content

Commit

Permalink
Bump to 2.3.1 (#1076)
Browse files Browse the repository at this point in the history
* feat: bump to 2.3.1

* feat: update tests
  • Loading branch information
OlenaPostindustria authored Dec 20, 2024
1 parent c04a415 commit 41d8758
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 58 deletions.
24 changes: 12 additions & 12 deletions EventHandlers/EventHandlers.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -1248,7 +1248,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MODULEMAP_FILE = "";
PRODUCT_BUNDLE_IDENTIFIER = org.prebid.mobile.PrebidMobileGAMEventHandlers;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand All @@ -1269,7 +1269,7 @@
CLANG_ENABLE_MODULES = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -1283,7 +1283,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MODULEMAP_FILE = "";
PRODUCT_BUNDLE_IDENTIFIER = org.prebid.mobile.PrebidMobileGAMEventHandlers;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand All @@ -1303,7 +1303,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -1318,7 +1318,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = org.prebid.mobile.PrebidMobileMAXAdapters;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand All @@ -1338,7 +1338,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -1353,7 +1353,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = org.prebid.mobile.PrebidMobileMAXAdapters;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES;
Expand Down Expand Up @@ -1415,7 +1415,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -1429,7 +1429,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = org.prebid.mobile.PrebidMobileAdMobAdapters;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = None;
Expand All @@ -1450,7 +1450,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++17";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
Expand All @@ -1464,7 +1464,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
PRODUCT_BUNDLE_IDENTIFIER = org.prebid.mobile.PrebidMobileAdMobAdapters;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = None;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ import Foundation
@objcMembers
public class AdMobConstants: NSObject {
public static let PrebidAdMobEventExtrasLabel = "PrebidAdMobCustomEventExtras"
public static let PrebidAdMobRewardedAdapterVersion = "2.0.0"
public static let PrebidAdMobRewardedAdapterVersion = "2.3.1"
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ import Foundation

@objcMembers
public class MAXConstants: NSObject {
public static let PrebidMAXAdapterVersion = "2.0.0"
public static let PrebidMAXAdapterVersion = "2.3.1"
}
2 changes: 1 addition & 1 deletion PrebidMobile.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "PrebidMobile"
s.version = "2.3.0"
s.version = "2.3.1"
s.summary = "PrebidMobile is a lightweight framework that integrates directly with Prebid Server."

s.description = <<-DESC
Expand Down
8 changes: 4 additions & 4 deletions PrebidMobile.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -4629,7 +4629,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -4648,7 +4648,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MODULEMAP_FILE = PrebidMobile/BuildFiles/PrebidMobile.modulemap;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -4667,7 +4667,7 @@
CODE_SIGN_IDENTITY = "";
CODE_SIGN_STYLE = Automatic;
CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)";
CURRENT_PROJECT_VERSION = 2.3.0;
CURRENT_PROJECT_VERSION = 2.3.1;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -4686,7 +4686,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.3.0;
MARKETING_VERSION = 2.3.1;
MODULEMAP_FILE = PrebidMobile/BuildFiles/PrebidMobile.modulemap;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
</MacroExpansion>
<Testables>
<TestableReference
skipped = "NO">
skipped = "NO"
parallelizable = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "60D792FA217E229B0080F428"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
skipped = "NO"
parallelizable = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "60D792FA217E229B0080F428"
Expand Down
2 changes: 1 addition & 1 deletion PrebidMobile/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import UIKit
public let PrebidLocalCacheIdKey = "hb_cache_id_local"

@objc public class Constants: NSObject {
@objc public static let PREBID_VERSION = "2.3.0"
@objc public static let PREBID_VERSION = "2.3.1"
}

extension String {
Expand Down
4 changes: 2 additions & 2 deletions PrebidMobileAdMobAdapters.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "PrebidMobileAdMobAdapters"
s.version = "2.3.0"
s.version = "2.3.1"
s.summary = "The bridge between PrebidMobile SDK and GMA SDK."

s.description = "AdMob Adatpers manages rendering of Prebid ads in the case of integration with AdMob as a Primary Ad Server."
Expand Down Expand Up @@ -40,7 +40,7 @@ Pod::Spec.new do |s|

s.static_framework = true

s.dependency 'PrebidMobile', '2.3.0'
s.dependency 'PrebidMobile', '2.3.1'
s.dependency 'Google-Mobile-Ads-SDK'

end
4 changes: 2 additions & 2 deletions PrebidMobileGAMEventHandlers.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "PrebidMobileGAMEventHandlers"
s.version = "2.3.0"
s.version = "2.3.1"
s.summary = "The bridge between PrebidMobile SDK and GMA SDK."

s.description = "GAM Event Handlers manages rendering of Prebid or GAM ads respectively to the winning bid."
Expand Down Expand Up @@ -39,7 +39,7 @@ Pod::Spec.new do |s|
s.source_files = 'EventHandlers/PrebidMobileGAMEventHandlers/**/*.{h,m,swift}'
s.static_framework = true

s.dependency 'PrebidMobile', '2.3.0'
s.dependency 'PrebidMobile', '2.3.1'
s.dependency 'Google-Mobile-Ads-SDK'

end
4 changes: 2 additions & 2 deletions PrebidMobileMAXAdapters.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "PrebidMobileMAXAdapters"
s.version = "2.3.0"
s.version = "2.3.1"
s.summary = "The bridge between PrebidMobile SDK and Applovin MAX SDK."

s.description = "MAX Adapters manages rendering of Prebid or MAX ads respectively to the winning bid."
Expand Down Expand Up @@ -39,7 +39,7 @@ Pod::Spec.new do |s|
s.source_files = 'EventHandlers/PrebidMobileMAXAdapters/**/*.{h,m,swift}'
s.static_framework = true

s.dependency 'PrebidMobile', '2.3.0'
s.dependency 'PrebidMobile', '2.3.1'
s.dependency 'AppLovinSDK'

end
29 changes: 2 additions & 27 deletions PrebidMobileTests/AdUnitTests/AdUnitTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
*/

import XCTest
import TestUtils
@testable import PrebidMobile

class AdUnitTests: XCTestCase {
Expand Down Expand Up @@ -148,10 +147,6 @@ class AdUnitTests: XCTestCase {
}

func testFetchDemandAutoRefresh() {
PBHTTPStubbingManager.shared().enable()
PBHTTPStubbingManager.shared().ignoreUnstubbedRequests = true
PBHTTPStubbingManager.shared().broadcastRequests = true

AdUnitSwizzleHelper.toggleCheckRefreshTime()
//given
let expectedFetchDemandCount = 2
Expand All @@ -176,20 +171,12 @@ class AdUnitTests: XCTestCase {
waitForExpectations(timeout: 10, handler: nil)
AdUnitSwizzleHelper.toggleCheckRefreshTime()

PBHTTPStubbingManager.shared().disable()
PBHTTPStubbingManager.shared().removeAllStubs()
PBHTTPStubbingManager.shared().broadcastRequests = false

//then
XCTAssertEqual(expectedFetchDemandCount, fetchDemandCount)

}

func testFetchDemandResumeAutoRefresh() {
PBHTTPStubbingManager.shared().enable()
PBHTTPStubbingManager.shared().ignoreUnstubbedRequests = true
PBHTTPStubbingManager.shared().broadcastRequests = true

AdUnitSwizzleHelper.toggleCheckRefreshTime()
//given
let expectedFetchDemandCount = 2
Expand All @@ -215,23 +202,15 @@ class AdUnitTests: XCTestCase {
sleep(1)
adUnit.resumeAutoRefresh()

waitForExpectations(timeout: 2, handler: nil)
waitForExpectations(timeout: 10, handler: nil)
AdUnitSwizzleHelper.toggleCheckRefreshTime()

PBHTTPStubbingManager.shared().disable()
PBHTTPStubbingManager.shared().removeAllStubs()
PBHTTPStubbingManager.shared().broadcastRequests = false

//then
XCTAssertEqual(expectedFetchDemandCount, fetchDemandCount)

}

func testFetchDemandBidsAutoRefresh() {
PBHTTPStubbingManager.shared().enable()
PBHTTPStubbingManager.shared().ignoreUnstubbedRequests = true
PBHTTPStubbingManager.shared().broadcastRequests = true

AdUnitSwizzleHelper.toggleCheckRefreshTime()
//given
let expectedFetchDemandCount = 2
Expand All @@ -252,13 +231,9 @@ class AdUnitTests: XCTestCase {
exception.fulfill()
})

waitForExpectations(timeout: 2, handler: nil)
waitForExpectations(timeout: 10, handler: nil)
AdUnitSwizzleHelper.toggleCheckRefreshTime()

PBHTTPStubbingManager.shared().disable()
PBHTTPStubbingManager.shared().removeAllStubs()
PBHTTPStubbingManager.shared().broadcastRequests = false

//then
XCTAssertEqual(expectedFetchDemandCount, fetchDemandCount)

Expand Down
6 changes: 3 additions & 3 deletions PrebidMobileTests/addendum/AdViewUtilsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class AdViewUtilsTests: XCTestCase {

wkWebView.loadHTMLString(html, baseURL: nil)

waitForExpectations(timeout: 15, handler: nil)
waitForExpectations(timeout: 30, handler: nil)
wkWebView.navigationDelegate = nil
}

Expand All @@ -233,7 +233,7 @@ class AdViewUtilsTests: XCTestCase {

// when
AdViewUtils.findPrebidCreativeSize(view, success: success, failure: failure)
waitForExpectations(timeout: 15, handler: nil)
waitForExpectations(timeout: 30, handler: nil)

// then
XCTAssertNil(size)
Expand Down Expand Up @@ -261,7 +261,7 @@ class AdViewUtilsTests: XCTestCase {

// when
AdViewUtils.findPrebidCreativeSize(view, success: success, failure: failure)
waitForExpectations(timeout: 15, handler: nil)
waitForExpectations(timeout: 30, handler: nil)

// then
XCTAssertNotNil(result)
Expand Down

0 comments on commit 41d8758

Please sign in to comment.