release 6.1.2

criteo · May 30, 2024 · b751de2 · b751de2
1 parent 6c7e25a
commit b751de2
Show file tree

Hide file tree

Showing 17 changed files with 43 additions and 40 deletions.
diff --git a/.github/workflows/release-cocoapods.yml b/.github/workflows/release-cocoapods.yml
@@ -5,15 +5,15 @@ on:
     types: [ published ]
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
 
 jobs:
   release-cocoapods:
-    runs-on: macos-12
+    runs-on: macos-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Ruby & Bundle setup
         uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/release-github.yml b/.github/workflows/release-github.yml
@@ -7,16 +7,16 @@ on:
       - '[0-9]+.[0-9]+.[0-9]+-[a-z]+[0-9]+'
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
 
 jobs:
   test-and-release:
     # Clone of main test workflow
-    runs-on: macos-12
+    runs-on: macos-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Ruby & Bundle setup
         uses: ruby/setup-ruby@v1
@@ -53,10 +53,10 @@ jobs:
           bundle exec fastlane format_check
 
       - name: Tests reports upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: tests-reports
+          name: tests-reports-${{ matrix.runs-on }}
           path: "fastlane/test_output"
 
       # Publish additional steps to test job

diff --git a/.github/workflows/test_0.yml b/.github/workflows/test_0.yml
@@ -9,15 +9,15 @@ on:
   workflow_dispatch:
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Ruby & Bundle setup
         uses: ruby/setup-ruby@v1
@@ -58,8 +58,8 @@ jobs:
           bundle exec fastlane test_0
 
       - name: Tests reports upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: tests-reports
+          name: tests-reports-${{ matrix.runs-on }}
           path: "fastlane/test_output"
diff --git a/.github/workflows/test_1.yml b/.github/workflows/test_1.yml
@@ -9,15 +9,15 @@ on:
   workflow_dispatch:
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Ruby & Bundle setup
         uses: ruby/setup-ruby@v1
@@ -58,8 +58,8 @@ jobs:
           bundle exec fastlane test_1
 
       - name: Tests reports upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: tests-reports
+          name: tests-reports-${{ matrix.runs-on }}
           path: "fastlane/test_output"
diff --git a/.github/workflows/test_2.yml b/.github/workflows/test_2.yml
@@ -9,15 +9,15 @@ on:
   workflow_dispatch:
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer
 
 jobs:
   test:
-    runs-on: macos-12
+    runs-on: macos-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Ruby & Bundle setup
         uses: ruby/setup-ruby@v1
@@ -58,8 +58,8 @@ jobs:
           bundle exec fastlane test_2
 
       - name: Tests reports upload
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: tests-reports
+          name: tests-reports-${{ matrix.runs-on }}
           path: "fastlane/test_output"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,13 @@
 # Criteo Publisher SDK Changelog
+--------------------------------------------------------------------------------
+## Version [6.1.2]
+
+### Features
+- Switch to macos-latest runner
+- Update checkout and upload actions to v4
+- Remove archs exclusion
+- Fix tests
+
 --------------------------------------------------------------------------------
 ## Version [6.1.1]
 

diff --git a/CriteoAdViewer/Sources/Info.plist b/CriteoAdViewer/Sources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.1.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

diff --git a/CriteoAdViewer/UITests/Info.plist b/CriteoAdViewer/UITests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/Info.plist b/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/Info.plist b/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/CriteoPublisherSdk.podspec b/CriteoPublisherSdk.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name              = "CriteoPublisherSdk"
-  spec.version           = "6.1.1"
+  spec.version           = "6.1.2-rc1"
   spec.summary           = "Criteo Publisher SDK for iOS"
 
   spec.description       = <<-DESC
@@ -39,10 +39,6 @@ Pod::Spec.new do |spec|
     adapter.source_files     = "CriteoGoogleAdapter/Sources/**/*.{h,m}"
     adapter.dependency         "CriteoPublisherSdk/Sdk"
     adapter.dependency         "Google-Mobile-Ads-SDK", "~> 10.1.0"
-
-    # Xcode 12 workaround: https://github.com/CocoaPods/CocoaPods/issues/10065
-    adapter.pod_target_xcconfig   = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e armv7 armv7s i386', 'EXCLUDED_ARCHS[sdk=iphoneos*]' => 'i386 x86_64' }
-    adapter.user_target_xcconfig  = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64 arm64e armv7 armv7s i386', 'EXCLUDED_ARCHS[sdk=iphoneos*]' => 'i386 x86_64' }
   end
 
 

diff --git a/CriteoPublisherSdk/Sources/Info.plist b/CriteoPublisherSdk/Sources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/CriteoPublisherSdk/Sources/Public/CRConstants.h b/CriteoPublisherSdk/Sources/Public/CRConstants.h
@@ -20,7 +20,7 @@
 #ifndef CRConstants_h
 #define CRConstants_h
 
-#define CRITEO_PUBLISHER_SDK_VERSION @"6.1.1"
+#define CRITEO_PUBLISHER_SDK_VERSION @"6.1.2-rc1"
 
 #define CRITEO_DEFAULT_REQUEST_TIMEOUT_IN_SECONDS 60
 #define CRITEO_DEFAULT_BID_TTL_IN_SECONDS 15 * 60

diff --git a/CriteoPublisherSdk/Tests/CriteoPublisherSdkTests-Info.plist b/CriteoPublisherSdk/Tests/CriteoPublisherSdkTests-Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 </dict>

diff --git a/CriteoPublisherSdk/Tests/IntegrationTests/CRInterstitialDelegateTests.m b/CriteoPublisherSdk/Tests/IntegrationTests/CRInterstitialDelegateTests.m
@@ -741,9 +741,7 @@ - (void)testInterstitialDidLoadForValidBid {
   WKWebView *mockWebView = OCMClassMock([WKWebView class]);
   UIView *mockView = OCMClassMock([UIView class]);
   CR_InterstitialViewController *interstitialVC =
-      [[CR_InterstitialViewController alloc] initWithWebView:mockWebView
-                                                        view:mockView
-                                                interstitial:nil];
+      [[CR_InterstitialViewController alloc] initWithWebView:mockWebView view:nil interstitial:nil];
   CRInterstitialAdUnit *adUnit1 = [[CRInterstitialAdUnit alloc] initWithAdUnitId:@"Yo"];
   CRInterstitialAdUnit *adUnit2 = [[CRInterstitialAdUnit alloc] initWithAdUnitId:@"Yo"];
   CRInterstitial *interstitial =

diff --git a/CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m b/CriteoPublisherSdk/Tests/UnitTests/Native/CRMediaViewTests.m
@@ -144,7 +144,7 @@ - (void)testSetMediaContent_GivenPlaceholderAndMultipleSuccessfulCall_SetPlaceho
 #pragma mark - Private
 
 - (UIImage *)imageWithWidth:(CGFloat)width {
-  return [UIImage imageWithSize:(CGSize){width, 0}];
+  return [UIImage imageWithSize:(CGSize){width, 1}];
 }
 
 - (CRMediaView *)buildMediaView {

diff --git a/CriteoPublisherSdk/iTestHostApp/Info.plist b/CriteoPublisherSdk/iTestHostApp/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.1</string>
+	<string>6.1.2</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>