Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ runs:

- name: Setup Ruby
if: ${{ inputs.setup-ruby == 'true' }}
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1.194.0
with:
ruby-version: '3.3.0'
bundler-cache: true
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-ios/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ runs:
- name: Setup Xcode version
uses: maxim-lobanov/setup-xcode@v1.6.0
with:
xcode-version: '15.4'
xcode-version: '16.0'

- name: Homebrew install git-crypt
run: brew install git-crypt
Expand Down Expand Up @@ -49,7 +49,7 @@ runs:
shell: bash

- name: Setup Ruby
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1.194.0
with:
ruby-version: '3.3.0'
bundler-cache: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/automerge_into_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
automerge:
needs: files-changed
name: Automerge
runs-on: macos-14
runs-on: macos-15

steps:
- name: Checkout
Expand All @@ -37,7 +37,7 @@ jobs:
token: ${{ secrets.GH_PAT }}

- name: Setup Ruby
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1.194.0
with:
ruby-version: "3.3.0"
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
needs: files-changed
if: ${{ github.event_name == 'workflow_dispatch' || needs.files-changed.outputs.ios == 'true' }}
name: Build iOS Caches
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 60

steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ jobs:
needs: files-changed
if: ${{ needs.files-changed.outputs.ios == 'true' || needs.files-changed.outputs.shared == 'true' }}
name: Run SwiftLint
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 10

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup Ruby
uses: ruby/setup-ruby@v1.190.0
uses: ruby/setup-ruby@v1.194.0
with:
ruby-version: "3.3.0"
bundler-cache: true
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
build-ios:
needs: swiftlint
name: Build iOS
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 30

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios_beta_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
deployment:
name: iOS Beta Deployment
needs: gradle-wrapper-validation
runs-on: macos-14
runs-on: macos-15
environment: ios_production
timeout-minutes: 60

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios_release_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
deployment:
name: iOS Release Deployment
needs: gradle-wrapper-validation
runs-on: macos-14
runs-on: macos-15
environment: ios_production
timeout-minutes: 60

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios_unit_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
test:
if: ${{ vars.IS_IOS_UNIT_TESTING_ENABLED == 'true' }}
name: Run iOS unit tests
runs-on: macos-14
runs-on: macos-15
timeout-minutes: 60

steps:
Expand Down
2 changes: 1 addition & 1 deletion iosHyperskillApp/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ target "iosHyperskillApp" do
pod "shared", :path => "../shared"

pod "SwiftLint", "0.54.0"
pod "Sentry", "8.17.2"
pod "Sentry", "8.36.0"

pod "RevenueCat", "4.41.1"

Expand Down
17 changes: 6 additions & 11 deletions iosHyperskillApp/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,9 @@ PODS:
- PanModal (1.2.7)
- PromisesObjC (2.4.0)
- RevenueCat (4.41.1)
- Sentry (8.17.2):
- Sentry/Core (= 8.17.2)
- SentryPrivate (= 8.17.2)
- Sentry/Core (8.17.2):
- SentryPrivate (= 8.17.2)
- SentryPrivate (8.17.2)
- Sentry (8.36.0):
- Sentry/Core (= 8.36.0)
- Sentry/Core (8.36.0)
- shared (1.0):
- RevenueCat (= 4.41.1)
- SkeletonUI (1.0.11)
Expand Down Expand Up @@ -130,7 +127,7 @@ DEPENDENCIES:
- NukeUI (from `https://github.com/kean/NukeUI.git`, tag `0.8.3`)
- PanModal (from `https://github.com/ivan-magda/PanModal.git`, branch `remove-presenting-appearance-transitions`)
- RevenueCat (= 4.41.1)
- Sentry (= 8.17.2)
- Sentry (= 8.36.0)
- shared (from `../shared`)
- SkeletonUI (= 1.0.11)
- SnapKit (= 5.7.1)
Expand Down Expand Up @@ -167,7 +164,6 @@ SPEC REPOS:
- PromisesObjC
- RevenueCat
- Sentry
- SentryPrivate
- SkeletonUI
- SnapKit
- STRegex
Expand Down Expand Up @@ -240,8 +236,7 @@ SPEC CHECKSUMS:
PanModal: 3e16ead1a907fb06f4df3f13492fd00149fa4974
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
RevenueCat: 1e7be26ae57d83bfd4191c9c4f1a01b3b409b215
Sentry: 64a9f9c3637af913adcf53deced05bbe452d1410
SentryPrivate: 024c6fed507ac39ae98e6d087034160f942920d5
Sentry: f8374b5415bc38dfb5645941b3ae31230fbeae57
shared: 347ef463ef2f66af50fc8e59d533b6007bc63518
SkeletonUI: a5514a3877d39f28229c852a567660d0f7542330
SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
Expand All @@ -250,6 +245,6 @@ SPEC CHECKSUMS:
SVProgressHUD: 4837c74bdfe2e51e8821c397825996a8d7de6e22
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211

PODFILE CHECKSUM: 1177593fe82412f60dfb7e58578b56066fe42f4f
PODFILE CHECKSUM: 09fa07fe4459b0ac13f67c359df0395b665b2ccf

COCOAPODS: 1.16.2
2 changes: 2 additions & 0 deletions iosHyperskillApp/iosHyperskillApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6013,6 +6013,7 @@
SDKROOT = iphoneos;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand Down Expand Up @@ -6067,6 +6068,7 @@
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
SWIFT_VERSION = 5.0;
VALIDATE_PRODUCT = YES;
};
name = Release;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SnapKit
import UIKit
import WebKit
@preconcurrency import WebKit

protocol ProcessedContentWebViewDelegate: AnyObject {
func processedContentTextViewDidLoadContent(_ view: ProcessedContentWebView)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import SafariServices
import shared
import SVProgressHUD
import UIKit
import WebKit
@preconcurrency import WebKit

final class WebControllerManager: NSObject {
static let shared = WebControllerManager()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,8 @@ struct AuthCredentialsView: View {
}
}

#Preview("iPhone 15 Pro") {
#if DEBUG
#Preview {
AuthCredentialsAssembly().makeModule()
.previewDevice(PreviewDevice(rawValue: "iPhone 15 Pro"))
}

#Preview("iPhone SE (Dark)") {
AuthCredentialsAssembly().makeModule()
.previewDevice(PreviewDevice(rawValue: "iPhone SE (3rd generation)"))
.preferredColorScheme(.dark)
}

#Preview("iPad") {
AuthCredentialsAssembly().makeModule()
.previewDevice(PreviewDevice(rawValue: "iPad (10th generation)"))
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ struct CommentsContentView: View {
}
}

extension CommentsScreenViewState.DiscussionItem: Identifiable {}
extension shared.CommentsScreenViewState.DiscussionItem: @retroactive Swift.Identifiable {}

extension CommentsScreenViewState.CommentItem: Identifiable {}
extension shared.CommentsScreenViewState.CommentItem: @retroactive Swift.Identifiable {}

extension CommentsCommentView {
init(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ struct ProgressBarButtonItem: View {
}
}

#Preview {
#if DEBUG
@available(iOS 17, *)
#Preview(traits: .sizeThatFitsLayout) {
VStack {
ProgressBarButtonItem(
progress: 0.65,
Expand All @@ -73,5 +75,5 @@ struct ProgressBarButtonItem: View {
}
.padding()
.background(Color(ColorPalette.background))
.previewLayout(.sizeThatFits)
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ struct ProgressScreenCardView: View {
}
}

#Preview {
#if DEBUG
@available(iOS 17, *)
#Preview(traits: .sizeThatFitsLayout) {
let appearance = ProgressScreenCardView.Appearance(
spacing: LayoutInsets.defaultInset,
interitemSpacing: LayoutInsets.smallInset,
Expand Down Expand Up @@ -111,7 +113,7 @@ struct ProgressScreenCardView: View {
subtitle: "Time to complete the track"
)
}
.previewLayout(.sizeThatFits)
.padding()
.background(Color.systemGroupedBackground)
}
#endif
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ final class SearchViewModel: FeatureViewModel<
}
}

extension SearchFeatureSearchResultsViewStateContent.Item: Identifiable {}
extension shared.SearchFeatureSearchResultsViewStateContent.Item: @retroactive Swift.Identifiable {}
Original file line number Diff line number Diff line change
Expand Up @@ -121,23 +121,19 @@ extension AppleIDSocialAuthSDKProvider: ASAuthorizationControllerDelegate {
}

private func handleDidCompleteWithError(_ error: Error) {
let sdkError: SocialAuthSDKError = {
let sdkError: SocialAuthSDKError =
if let sdkError = error as? SocialAuthSDKError {
return sdkError
sdkError
} else if let authorizationError = error as? ASAuthorizationError {
switch authorizationError.code {
case .canceled:
return .canceled
case .unknown, .invalidResponse, .notHandled, .failed, .notInteractive:
return .connectionError(originalError: error)
@unknown default:
return .connectionError(originalError: error)
.canceled
default:
.connectionError(originalError: error)
}
} else {
return .connectionError(originalError: error)
.connectionError(originalError: error)
}
}()

completionHandler?(.failure(sdkError))
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ final class AppsFlyerManager: AppsFlyerAnalyticEngine {
values: values,
completionHandler: { dictionaryOrNil, errorOrNil in
if let error = errorOrNil {
assertionFailure("AppsFlyerManager: failed log event = \(name) with error =\(error)")
print("AppsFlyerManager: failed log event = \(name), values = \(values), error =\(error)")
} else {
print("""
AppsFlyerManager: successfully logged event = \(name) with result = \(String(describing: dictionaryOrNil))
Expand Down
Loading