diff --git a/.github/workflows/archive.yml b/.github/workflows/archive.yml index 07027306..4dc74b68 100644 --- a/.github/workflows/archive.yml +++ b/.github/workflows/archive.yml @@ -8,7 +8,7 @@ jobs: archive: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: bundle install - run: pod repo update - run: pod install @@ -17,4 +17,4 @@ jobs: xcodebuild -workspace ooniprobe.xcworkspace -scheme ooniprobe \ -destination='name=Any iOS Device' -sdk iphoneos archive CODE_SIGNING_ALLOWED="NO" | xcpretty env: - DEVELOPER_DIR: /Applications/Xcode_13.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 666010d8..dab46c60 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,13 +8,13 @@ jobs: test: runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: bundle install - run: pod repo update - run: pod install - run: | set -o pipefail xcodebuild clean build test -workspace ooniprobe.xcworkspace -sdk iphonesimulator \ - -scheme ooniprobe -destination 'name=iPhone 11 Pro Max' | xcpretty + -scheme ooniprobe -destination 'name=iPhone 14' | xcpretty env: - DEVELOPER_DIR: /Applications/Xcode_13.2.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer diff --git a/Podfile b/Podfile index 07e3f054..7594c228 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! inhibit_all_warnings! target 'ooniprobe' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.17.5/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.18.1/oonimkall.podspec" pod 'Toast', '~> 4.0.0' pod 'MBProgressHUD' pod 'DZNEmptyDataSet' @@ -19,7 +19,7 @@ target 'ooniprobe' do end target 'OONIProbeUnitTests' do - pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.17.5/oonimkall.podspec" + pod "oonimkall", :podspec => "https://github.com/ooni/probe-cli/releases/download/v3.18.1/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 8e4c31d8..5e20c6ca 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -9,7 +9,7 @@ PODS: - MBProgressHUD (1.2.0) - MKDropdownMenu (1.4) - OCMapper (2.0) - - oonimkall (2023.06.08-161439) + - oonimkall (2023.07.18-162800) - RHMarkdownLabel (0.0.1): - TTTAttributedLabel - XNGMarkdownParser @@ -30,7 +30,7 @@ DEPENDENCIES: - MBProgressHUD - MKDropdownMenu - OCMapper (= 2.0) - - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.17.5/oonimkall.podspec`) + - oonimkall (from `https://github.com/ooni/probe-cli/releases/download/v3.18.1/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`) @@ -53,7 +53,7 @@ SPEC REPOS: EXTERNAL SOURCES: oonimkall: - :podspec: https://github.com/ooni/probe-cli/releases/download/v3.17.5/oonimkall.podspec + :podspec: https://github.com/ooni/probe-cli/releases/download/v3.18.1/oonimkall.podspec Sentry: :git: https://github.com/getsentry/sentry-cocoa.git :tag: 6.1.4 @@ -78,7 +78,7 @@ SPEC CHECKSUMS: MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406 MKDropdownMenu: 269df4a41d21a1db684ce8bc709befe419fc5bae OCMapper: 9b4d542543794c42adc01f1493d894f53e193cb0 - oonimkall: c3d43e15a7452f7d1ca621af49666804f9afb48e + oonimkall: 7765766adbf7284e866fee5590acf55b1b76995e RHMarkdownLabel: 81d6772768e621be57302b7fd5212ad4f78fb0bd Sentry: 9d055e2de30a77685e86b219acf02e59b82091fc SharkORM: 252e4411923110ac1b524a993ee2b3fa13eed7c4 @@ -86,6 +86,6 @@ SPEC CHECKSUMS: TTTAttributedLabel: 8cffe8e127e4e82ff3af1e5386d4cd0ad000b656 XNGMarkdownParser: aed98c14f0c0eb20064184ddf9bac26c482722b2 -PODFILE CHECKSUM: f9c5cd65008e7b98b8467b923f08c458026328e1 +PODFILE CHECKSUM: e82378591e42a948797afaec35b1efccdb5765ac COCOAPODS: 1.12.1 diff --git a/ooniprobe.xcodeproj/project.pbxproj b/ooniprobe.xcodeproj/project.pbxproj index 1283a6b8..95ddd846 100644 --- a/ooniprobe.xcodeproj/project.pbxproj +++ b/ooniprobe.xcodeproj/project.pbxproj @@ -16,6 +16,8 @@ 7940AA8E28117E9000C0EB5D /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7940AA8C28117E9000C0EB5D /* MainInterface.storyboard */; }; 7940AA9228117E9000C0EB5D /* share.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7940AA8828117E9000C0EB5D /* share.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 79780FCF27E9F18E002A38B1 /* Languages.plist in Resources */ = {isa = PBXBuildFile; fileRef = 79780FCE27E9F18E002A38B1 /* Languages.plist */; }; + 7AED19812A6EC9A2003B265A /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AED19802A6EC9A2003B265A /* libresolv.tbd */; }; + 7AED19832A6EC9C7003B265A /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AED19822A6EC9C7003B265A /* libresolv.tbd */; }; D4A2F5DF1A6C3244001B8460 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A2F5DE1A6C3244001B8460 /* main.m */; }; D4A2F5E21A6C3244001B8460 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A2F5E11A6C3244001B8460 /* AppDelegate.m */; }; D4A2F5EA1A6C3244001B8460 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D4A2F5E91A6C3244001B8460 /* Images.xcassets */; }; @@ -222,6 +224,8 @@ 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 = ""; }; + 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 = ""; }; BB32DF3D6FC174AA1AF76009 /* Pods_ooniprobe.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ooniprobe.framework; sourceTree = BUILT_PRODUCTS_DIR; }; CAFF8CF760913F0065D0615D /* Pods-OONIProbeUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OONIProbeUnitTests.release.xcconfig"; path = "Target Support Files/Pods-OONIProbeUnitTests/Pods-OONIProbeUnitTests.release.xcconfig"; sourceTree = ""; }; @@ -548,6 +552,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7AED19812A6EC9A2003B265A /* libresolv.tbd in Frameworks */, ED3582321FE948580078CCEE /* libsqlite3.tbd in Frameworks */, 58E18F9EBF4FAD4EFCE020F3 /* Pods_ooniprobe.framework in Frameworks */, ); @@ -557,6 +562,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7AED19832A6EC9C7003B265A /* libresolv.tbd in Frameworks */, 03D47FE8406C42B41DF540D0 /* Pods_OONIProbeUnitTests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1143,6 +1149,8 @@ F4F15431D4412F561191270F /* Frameworks */ = { isa = PBXGroup; children = ( + 7AED19802A6EC9A2003B265A /* libresolv.tbd */, + 7AED19822A6EC9C7003B265A /* libresolv.tbd */, ED3582311FE948580078CCEE /* libsqlite3.tbd */, 588219FACC9F793A15BDEA33 /* Pods_OONIProbeUnitTests.framework */, BB32DF3D6FC174AA1AF76009 /* Pods_ooniprobe.framework */,