From 22a26c9e2362aadfceafbad8d9796cad75a7ff94 Mon Sep 17 00:00:00 2001 From: Norbel Ambanumben Date: Tue, 17 Oct 2023 07:44:55 +0100 Subject: [PATCH] Updated version of engine to `v3.19.0-alpha.4` --- Podfile | 14 ++++++++++-- Podfile.lock | 35 ++++++++++++++++++++++++----- ooniprobe.xcodeproj/project.pbxproj | 14 ++++++++++-- 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/Podfile b/Podfile index d0e8b278..69810cd0 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,12 @@ use_frameworks! inhibit_all_warnings! target 'ooniprobe' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" + pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec" + pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec" + pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec" + pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec" + pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec" pod 'Toast', '~> 4.0.0' pod 'MBProgressHUD' pod 'DZNEmptyDataSet' @@ -19,7 +24,12 @@ target 'ooniprobe' do end target 'OONIProbeUnitTests' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec" + pod "libcrypto", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec" + pod "libevent", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec" + pod "libssl", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec" + pod "libtor", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec" + pod "libz", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec" pod 'SharkORM', :git => 'https://github.com/sharksync/sharkorm', :tag => 'v2.3.67' pod 'OCMapper', '2.0' end diff --git a/Podfile.lock b/Podfile.lock index d7760c89..ca1024f1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,11 +5,16 @@ PODS: - DateTools (2.0.0) - DZNEmptyDataSet (1.8.1) - Harpy (4.1.14) + - libcrypto (2023.10.16-230758) + - libevent (2023.10.16-230758) + - libssl (2023.10.16-230758) + - libtor (2023.10.16-230758) + - libz (2023.10.16-230758) - lottie-ios (2.5.3) - MBProgressHUD (1.2.0) - MKDropdownMenu (1.4) - OCMapper (2.0) - - oonimkall (2023.10.12-182759) + - oonimkall (2023.10.16-230758) - RHMarkdownLabel (0.0.1): - TTTAttributedLabel - XNGMarkdownParser @@ -26,11 +31,16 @@ DEPENDENCIES: - DateTools - DZNEmptyDataSet - Harpy + - libcrypto (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec`) + - libevent (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec`) + - libssl (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec`) + - libtor (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec`) + - libz (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec`) - lottie-ios (= 2.5.3) - MBProgressHUD - MKDropdownMenu - OCMapper (= 2.0) - - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec`) + - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec`) - RHMarkdownLabel - Sentry (from `https://github.com/getsentry/sentry-cocoa.git`, tag `6.1.4`) - SharkORM (from `https://github.com/sharksync/sharkorm`, tag `v2.3.67`) @@ -52,8 +62,18 @@ SPEC REPOS: - XNGMarkdownParser EXTERNAL SOURCES: + libcrypto: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libcrypto.podspec + libevent: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libevent.podspec + libssl: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libssl.podspec + libtor: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libtor.podspec + libz: + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/libz.podspec oonimkall: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.3/oonimkall.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.19.0-alpha.4/oonimkall.podspec Sentry: :git: https://github.com/getsentry/sentry-cocoa.git :tag: 6.1.4 @@ -74,11 +94,16 @@ SPEC CHECKSUMS: DateTools: 933ac9c490f21f92127cf690ccd8c397e0126caf DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7 Harpy: b2fbe6819f6a8932df32d7cd2fb20f442df86bbc + libcrypto: 31c72ba1c3163dc883401737905112116f20a503 + libevent: ed39b4c48ded7557fc25d4fa6c00742a19377824 + libssl: 26f3dd9546d4894a9a948fad8b5390345e74f774 + libtor: 5bf7771e91058a5e3d367b666bd20fa90a4c8725 + libz: 7e8bf58f5b129c7d9e534ef911a997b4e679e884 lottie-ios: a50d5c0160425cd4b01b852bb9578963e6d92d31 MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0 - oonimkall: a4df7be72eef56e7f181c3444327f8f28492301e + oonimkall: 3f3ad58bd13b2f7d83a8a6da38a28dd244b2d1b5 RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4 @@ -86,6 +111,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: b246998cd93204e6deffcde852999bc3c2036e56 +PODFILE CHECKSUM: a3524c14cf982a44d1e5d8e55e5313d4cf8b41bd COCOAPODS: 1.13.0 diff --git a/ooniprobe.xcodeproj/project.pbxproj b/ooniprobe.xcodeproj/project.pbxproj index 2258f2f7..39579f1e 100644 --- a/ooniprobe.xcodeproj/project.pbxproj +++ b/ooniprobe.xcodeproj/project.pbxproj @@ -224,6 +224,11 @@ 7940AA8F28117E9000C0EB5D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 7940AA972811840900C0EB5D /* share.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = share.entitlements; sourceTree = ""; }; 79780FCE27E9F18E002A38B1 /* Languages.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Languages.plist; sourceTree = ""; }; + 7A8CB0932ADDDAC1005AB2BC /* libcrypto.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcrypto.xcframework; path = Pods/libcrypto/libcrypto.xcframework; sourceTree = ""; }; + 7A8CB0942ADDDAC1005AB2BC /* libevent.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libevent.xcframework; path = Pods/libevent/libevent.xcframework; sourceTree = ""; }; + 7A8CB0952ADDDAC1005AB2BC /* libssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libssl.xcframework; path = Pods/libssl/libssl.xcframework; sourceTree = ""; }; + 7A8CB0962ADDDAC1005AB2BC /* libtor.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libtor.xcframework; path = Pods/libtor/libtor.xcframework; sourceTree = ""; }; + 7A8CB0972ADDDAC1005AB2BC /* libz.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libz.xcframework; path = Pods/libz/libz.xcframework; sourceTree = ""; }; 7AED19802A6EC9A2003B265A /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; 7AED19822A6EC9C7003B265A /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.3.sdk/usr/lib/libresolv.tbd; sourceTree = DEVELOPER_DIR; }; AC948DA31A71FB931BBB1BB3 /* Pods-OONIProbeUnitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OONIProbeUnitTests.debug.xcconfig"; path = "Target Support Files/Pods-OONIProbeUnitTests/Pods-OONIProbeUnitTests.debug.xcconfig"; sourceTree = ""; }; @@ -1149,6 +1154,11 @@ F4F15431D4412F561191270F /* Frameworks */ = { isa = PBXGroup; children = ( + 7A8CB0932ADDDAC1005AB2BC /* libcrypto.xcframework */, + 7A8CB0942ADDDAC1005AB2BC /* libevent.xcframework */, + 7A8CB0952ADDDAC1005AB2BC /* libssl.xcframework */, + 7A8CB0962ADDDAC1005AB2BC /* libtor.xcframework */, + 7A8CB0972ADDDAC1005AB2BC /* libz.xcframework */, 7AED19802A6EC9A2003B265A /* libresolv.tbd */, 7AED19822A6EC9C7003B265A /* libresolv.tbd */, ED3582311FE948580078CCEE /* libsqlite3.tbd */, @@ -2016,7 +2026,7 @@ IBC_WARNINGS = NO; IBSC_WARNINGS = NO; INFOPLIST_FILE = ooniprobe/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 3.8.3; @@ -2066,7 +2076,7 @@ IBC_WARNINGS = NO; IBSC_WARNINGS = NO; INFOPLIST_FILE = ooniprobe/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)"; MARKETING_VERSION = 3.8.3;