Skip to content

Commit

Permalink
Merge pull request #1191 from hyperskill/release/1.73
Browse files Browse the repository at this point in the history
Release 1.73
  • Loading branch information
ivan-magda authored Sep 27, 2024
2 parents 2946f15 + 6392c81 commit 0da1d29
Show file tree
Hide file tree
Showing 78 changed files with 1,499 additions and 133 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android_beta_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
Expand All @@ -47,7 +47,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android_deploy_to_firebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android_deploy_to_firebase_manually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android_release_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
Expand All @@ -39,7 +39,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/automerge_into_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
fetch-depth: 0
token: ${{ secrets.GH_PAT }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
uses: ./.github/actions/setup-android
Expand All @@ -55,7 +55,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
timeout-minutes: 5
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
Expand All @@ -64,7 +64,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
uses: ./.github/actions/setup-android
Expand All @@ -91,7 +91,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
uses: ./.github/actions/setup-android
Expand All @@ -115,7 +115,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup Ruby
uses: ruby/setup-ruby@v1.190.0
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand All @@ -175,7 +175,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand All @@ -198,7 +198,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cleanup_pr_caches.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Detect changes
uses: dorny/paths-filter@v3.0.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh_pages_analytics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
uses: ./.github/actions/setup-android
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios_beta_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
Expand All @@ -40,7 +40,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios_release_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v4
Expand All @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
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 @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0

- name: Setup CI
id: setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/merge_main_into_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.7
uses: actions/checkout@v4.2.0
with:
fetch-depth: 0
token: ${{ secrets.GH_PAT }}
Expand Down
2 changes: 1 addition & 1 deletion androidHyperskillApp/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
ruby "3.3.0"

gem "fastlane", "2.222.0"
gem "fastlane", "2.223.1"
gem "rexml", ">= 3.3.6"

eval_gemfile("fastlane/Pluginfile")
30 changes: 14 additions & 16 deletions androidHyperskillApp/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.968.0)
aws-sdk-core (3.202.0)
aws-partitions (1.980.0)
aws-sdk-core (3.209.1)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.9)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (1.94.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.159.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-s3 (1.166.0)
aws-sdk-core (~> 3, >= 3.207.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
aws-sigv4 (1.9.1)
aws-sigv4 (1.10.0)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
base64 (0.2.0)
Expand All @@ -39,7 +39,7 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
excon (0.111.0)
faraday (1.10.3)
faraday (1.10.4)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
Expand All @@ -65,10 +65,10 @@ GEM
faraday-patron (1.0.0)
faraday-rack (1.0.0)
faraday-retry (1.0.3)
faraday_middleware (1.2.0)
faraday_middleware (1.2.1)
faraday (~> 1.0)
fastimage (2.3.1)
fastlane (2.222.0)
fastlane (2.223.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -159,7 +159,7 @@ GEM
httpclient (2.8.3)
jmespath (1.6.2)
json (2.7.2)
jwt (2.8.2)
jwt (2.9.1)
base64
mini_magick (4.13.2)
mini_mime (1.1.5)
Expand All @@ -178,8 +178,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.3.6)
strscan
rexml (3.3.7)
rouge (2.0.7)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -192,7 +191,6 @@ GEM
simctl (1.6.10)
CFPropertyList
naturally
strscan (3.1.0)
terminal-notifier (2.0.0)
terminal-table (3.0.2)
unicode-display_width (>= 1.1.1, < 3)
Expand All @@ -202,7 +200,7 @@ GEM
tty-spinner (0.9.3)
tty-cursor (~> 0.7)
uber (0.1.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
word_wrap (1.0.0)
xcodeproj (1.25.0)
CFPropertyList (>= 2.3.3, < 4.0)
Expand All @@ -224,7 +222,7 @@ PLATFORMS
x86_64-linux

DEPENDENCIES
fastlane (= 2.222.0)
fastlane (= 2.223.1)
fastlane-plugin-firebase_app_distribution
rexml (>= 3.3.6)

Expand Down
2 changes: 1 addition & 1 deletion androidHyperskillApp/fastlane/Fastfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
fastlane_version "2.222.0"
fastlane_version "2.223.0"

default_platform(:android)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,9 @@ abstract class DefaultStepQuizFragment :
StepQuizFeature.Action.ViewAction.UnhighlightCallToActionButton -> {
// no op
}
StepQuizFeature.Action.ViewAction.BounceCallToActionButton -> {
// TODO: ALTAPPS-1349 Implement bounce animation
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,9 @@ class StudyPlanFragment :
)
)
}
is StudyPlanScreenFeature.Action.ViewAction.NotificationDailyStudyReminderWidgetViewAction -> {
// TODO: ALTAPPS-1347 handle notification daily study reminder widget view actions
}
}
}

Expand Down
3 changes: 3 additions & 0 deletions config/detekt/baseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<ID>ComplexCondition:GamificationToolbarReducer.kt$GamificationToolbarReducer$state is State.Idle || (message.forceUpdate &amp;&amp; (state is State.Content || state is State.Error))</ID>
<ID>ComplexCondition:LeaderboardWidgetReducer.kt$LeaderboardWidgetReducer$state is State.Idle || (message.forceUpdate &amp;&amp; (state is State.Content || state is State.Error))</ID>
<ID>ComplexCondition:ProfileReducer.kt$ProfileReducer$state is State.Idle || (message.forceUpdate &amp;&amp; (state is State.Content || state is State.Error))</ID>
<ID>ComplexCondition:StepQuizReducer.kt$StepQuizReducer$state.stepQuizState is StepQuizState.AttemptLoaded &amp;&amp; !StepQuizResolver.isQuizEnabled(state.stepQuizState) &amp;&amp; state.stepQuizState.submission?.status.isWrongOrRejected &amp;&amp; StepQuizResolver.isNeedRecreateAttemptForNewSubmission(state.stepQuizState.step)</ID>
<ID>ComplexCondition:TopicsRepetitionsReducer.kt$TopicsRepetitionsReducer$state is State.Idle || (message.forceUpdate &amp;&amp; (state is State.Content || state is State.NetworkError))</ID>
<ID>ComplexCondition:WelcomeReducer.kt$WelcomeReducer$state is State.Idle || (message.forceUpdate &amp;&amp; (state is State.Content || state is State.NetworkError))</ID>
<ID>ComposableParamOrder:FindStage.kt$FindStage</ID>
Expand Down Expand Up @@ -178,6 +179,8 @@
<ID>MaxLineLength:ExpandableTextView.kt$ExpandableTextView$*</ID>
<ID>MaxLineLength:HtmlText.kt$text</ID>
<ID>MaxLineLength:LinearProgressIndicator.kt$*</ID>
<ID>MaxLineLength:NotificationDailyStudyReminderWidgetComponentImpl.kt$NotificationDailyStudyReminderWidgetComponentImpl$override</ID>
<ID>MaxLineLength:NotificationDailyStudyReminderWidgetComponentImpl.kt$NotificationDailyStudyReminderWidgetComponentImpl$private</ID>
<ID>MaxLineLength:ProjectSelectionDetailsClickedSelectThisProjectHyperskillAnalyticEvent.kt$ProjectSelectionDetailsClickedSelectThisProjectHyperskillAnalyticEvent$*</ID>
<ID>MaxLineLength:RepositoryCacheProxy.kt$RepositoryCacheProxy$*</ID>
<ID>MaxLineLength:StepComponentImpl.kt$StepComponentImpl$nextLearningActivityStateRepository = appGraph.stateRepositoriesComponent.nextLearningActivityStateRepository</ID>
Expand Down
4 changes: 2 additions & 2 deletions gradle/app.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
minSdk = '24'
targetSdk = '34'
compileSdk = '34'
versionName = '1.72'
versionCode = '560'
versionName = '1.73'
versionCode = '567'
2 changes: 1 addition & 1 deletion iosHyperskillApp/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source "https://rubygems.org"
ruby "3.3.0"

gem "fastlane", "2.222.0"
gem "fastlane", "2.223.1"
gem "cocoapods", "1.15.2"
gem "generamba", git: "https://github.com/ivan-magda/Generamba.git", branch: "develop"

Expand Down
Loading

0 comments on commit 0da1d29

Please sign in to comment.