From 050025b6cd8b71235ca164474b95ca2a5494a2bc Mon Sep 17 00:00:00 2001 From: Sergii Khliustin Date: Mon, 8 Jul 2024 14:09:48 +0200 Subject: [PATCH] Fix tests --- TestTools/Pods.json | 10 +- Tests/Recorded/MMKV/BUILD.bazel | 4 +- Tests/Recorded/MMKVAppExtension/BUILD.bazel | 4 +- Tests/Recorded/MMKVCore/BUILD.bazel | 4 +- .../Recorded/PLMediaStreamingKit/BUILD.bazel | 128 ------------------ 5 files changed, 11 insertions(+), 139 deletions(-) delete mode 100644 Tests/Recorded/PLMediaStreamingKit/BUILD.bazel diff --git a/TestTools/Pods.json b/TestTools/Pods.json index 3ee8cecc..f738b3e3 100644 --- a/TestTools/Pods.json +++ b/TestTools/Pods.json @@ -391,10 +391,13 @@ "version": "3.7.6" }, "MMKV": { - "version": "1.3.5" + "version": "1.3.7" }, "MMKVAppExtension": { - "version": "1.3.5" + "version": "1.3.7" + }, + "MMKVCore": { + "version": "1.3.7" }, "MTHawkeye": { "version": "0.12.8" @@ -429,9 +432,6 @@ "OCMockito": { "version": "7.0.2" }, - "PLMediaStreamingKit": { - "version": "3.1.0" - }, "PSPDFTextView": { "version": "1.2.0" }, diff --git a/Tests/Recorded/MMKV/BUILD.bazel b/Tests/Recorded/MMKV/BUILD.bazel index 1ede6fd1..d560a558 100644 --- a/Tests/Recorded/MMKV/BUILD.bazel +++ b/Tests/Recorded/MMKV/BUILD.bazel @@ -79,7 +79,7 @@ apple_framework( "CoreFoundation" ], cc_copts = [ - "-std=gnu++17" + "-std=gnu++20" ], xcconfig = { "CLANG_CXX_LIBRARY": "libc++", @@ -109,7 +109,7 @@ genrule( CFBundlePackageType FMWK CFBundleShortVersionString - 1.3.5 + 1.3.7 CFBundleSignature ???? CFBundleSupportedPlatforms diff --git a/Tests/Recorded/MMKVAppExtension/BUILD.bazel b/Tests/Recorded/MMKVAppExtension/BUILD.bazel index 02342622..9e10bce8 100644 --- a/Tests/Recorded/MMKVAppExtension/BUILD.bazel +++ b/Tests/Recorded/MMKVAppExtension/BUILD.bazel @@ -80,7 +80,7 @@ apple_framework( "CoreFoundation" ], cc_copts = [ - "-std=gnu++17" + "-std=gnu++20" ], xcconfig = { "CLANG_CXX_LIBRARY": "libc++", @@ -113,7 +113,7 @@ genrule( CFBundlePackageType FMWK CFBundleShortVersionString - 1.3.5 + 1.3.7 CFBundleSignature ???? CFBundleSupportedPlatforms diff --git a/Tests/Recorded/MMKVCore/BUILD.bazel b/Tests/Recorded/MMKVCore/BUILD.bazel index f9f5ca56..5c5d123c 100644 --- a/Tests/Recorded/MMKVCore/BUILD.bazel +++ b/Tests/Recorded/MMKVCore/BUILD.bazel @@ -109,7 +109,7 @@ apple_framework( "UIKit" ], cc_copts = [ - "-std=gnu++17", + "-std=gnu++20", "-x", "objective-c++" ], @@ -141,7 +141,7 @@ genrule( CFBundlePackageType FMWK CFBundleShortVersionString - 1.3.5 + 1.3.7 CFBundleSignature ???? CFBundleSupportedPlatforms diff --git a/Tests/Recorded/PLMediaStreamingKit/BUILD.bazel b/Tests/Recorded/PLMediaStreamingKit/BUILD.bazel deleted file mode 100644 index 0177067f..00000000 --- a/Tests/Recorded/PLMediaStreamingKit/BUILD.bazel +++ /dev/null @@ -1,128 +0,0 @@ -load('@build_bazel_rules_apple//apple:apple.bzl', 'apple_dynamic_framework_import') -load('@build_bazel_rules_ios//rules:framework.bzl', 'apple_framework') -# Add a config setting release for compilation mode -# Assume that people are using `opt` for release mode -# see the bazel user manual for more information -# https://docs.bazel.build/versions/master/be/general.html#config_setting -config_setting( - name = "release", - values = { - "compilation_mode": "opt" - } -) -config_setting( - name = "ios_arm64", - values = { - "cpu": "ios_arm64" - } -) -config_setting( - name = "ios_armv7", - values = { - "cpu": "ios_armv7" - } -) -config_setting( - name = "ios_sim_arm64", - values = { - "cpu": "ios_sim_arm64" - } -) -apple_framework( - name = "PLMediaStreamingKit", - module_name = "PLMediaStreamingKit", - bundle_id = "org.cocoapods.PLMediaStreamingKit", - link_dynamic = False, - testonly = False, - platforms = { - "ios": "10.0" - }, - deps = select( - { - "//conditions:default": [], - ":ios_arm64": [ - ":PLMediaStreamingKit_HappyDNS_VendoredFramework", - ":PLMediaStreamingKit_PLMediaStreamingKit_VendoredFramework" - ], - ":ios_armv7": [ - ":PLMediaStreamingKit_HappyDNS_VendoredFramework" - ], - ":ios_sim_arm64": [ - ":PLMediaStreamingKit_HappyDNS_ios_sim_arm64__VendoredFramework" - ] - } - ), - objc_defines = [ - "COCOAPODS=1" - ] + select( - { - "//conditions:default": [ - "POD_CONFIGURATION_DEBUG=1", - "DEBUG=1" - ], - ":release": [ - "POD_CONFIGURATION_RELEASE=1" - ] - } - ), - swift_defines = [ - "COCOAPODS" - ] + select( - { - "//conditions:default": [ - "DEBUG" - ] - } - ), - sdk_dylibs = [ - "c++", - "icucore", - "sqlite3", - "z" - ], - sdk_frameworks = [ - "AVFoundation", - "AudioToolbox", - "CFNetwork", - "CoreGraphics", - "CoreMedia", - "UIKit", - "VideoToolbox" - ], - visibility = [ - "//visibility:public" - ] -) -apple_dynamic_framework_import( - name = "PLMediaStreamingKit_HappyDNS_VendoredFramework", - framework_imports = glob( - [ - "Pod/Library/HappyDNS.framework/**" - ] - ), - visibility = [ - "//visibility:public" - ] -) -apple_dynamic_framework_import( - name = "PLMediaStreamingKit_PLMediaStreamingKit_VendoredFramework", - framework_imports = glob( - [ - "Pod/Library/PLMediaStreamingKit.framework/**" - ] - ), - visibility = [ - "//visibility:public" - ] -) -apple_dynamic_framework_import( - name = "PLMediaStreamingKit_HappyDNS_ios_sim_arm64__VendoredFramework", - framework_imports = glob( - [ - "Pod/Library/._ios_sim_arm64_/HappyDNS.framework/**" - ] - ), - visibility = [ - "//visibility:public" - ] -) \ No newline at end of file