Skip to content

Commit

Permalink
Merge pull request #1146 from hyperskill/release/1.67
Browse files Browse the repository at this point in the history
Release 1.67
  • Loading branch information
ivan-magda authored Aug 12, 2024
2 parents 4c1e694 + 1195629 commit 33d5125
Show file tree
Hide file tree
Showing 88 changed files with 2,321 additions and 459 deletions.
4 changes: 2 additions & 2 deletions .github/actions/setup-android/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ runs:

- name: Setup Ruby
if: ${{ inputs.setup-ruby == 'true' }}
uses: ruby/setup-ruby@v1.175.1
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: '3.3.0'
bundler-cache: true
working-directory: './androidHyperskillApp'

- name: Setup Java JDK
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4.2.2
with:
java-version: '19'
distribution: 'temurin'
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 @@ -49,14 +49,14 @@ runs:
shell: bash

- name: Setup Ruby
uses: ruby/setup-ruby@v1.175.1
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: '3.3.0'
bundler-cache: true
working-directory: './iosHyperskillApp'

- name: Setup Java JDK
uses: actions/setup-java@v4.2.1
uses: actions/setup-java@v4.2.2
with:
java-version: '19'
distribution: 'temurin'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/android_beta_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4.1.7

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v3
uses: gradle/actions/wrapper-validation@v4

# Build and submit to the Firebase App Distribution
firebase-deployment:
Expand All @@ -47,7 +47,7 @@ jobs:

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

- 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.4
uses: actions/checkout@v4.1.7

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

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v3
uses: gradle/actions/wrapper-validation@v4

# Build and submit to the Firebase App Distribution
firebase-deployment:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/android_release_deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4.1.7

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v3
uses: gradle/actions/wrapper-validation@v4

# Build and submit to the Google Play
deployment:
Expand All @@ -39,7 +39,7 @@ jobs:

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

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

steps:
- name: Checkout
uses: actions/checkout@v4.1.4
uses: actions/checkout@v4.1.7
with:
fetch-depth: 0
token: ${{ secrets.GH_PAT }}

- name: Setup Ruby
uses: ruby/setup-ruby@v1.175.1
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: "3.3.0"
bundler-cache: true
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.4
uses: actions/checkout@v4.1.7

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

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

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

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v3
uses: gradle/actions/wrapper-validation@v4

files-changed:
name: Detect changes
Expand All @@ -64,7 +64,7 @@ jobs:

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

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

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

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

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

- name: Setup Ruby
uses: ruby/setup-ruby@v1.175.1
uses: ruby/setup-ruby@v1.190.0
with:
ruby-version: '3.3.0'
bundler-cache: true
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:

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

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

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

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

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

- 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.4
uses: actions/checkout@v4.1.7

- 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.4
uses: actions/checkout@v4.1.7

- 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.4
uses: actions/checkout@v4.1.7

- 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.4
uses: actions/checkout@v4.1.7

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

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v3
uses: gradle/actions/wrapper-validation@v4

# Build, archive for ad-hoc and submit to Firebase App Distribution
deployment:
Expand All @@ -40,7 +40,7 @@ jobs:

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

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

- name: Gradle Wrapper Validation
uses: gradle/actions/wrapper-validation@v3
uses: gradle/actions/wrapper-validation@v4

# Build, archive for app-store and submit to App Store Connect
deployment:
Expand All @@ -36,7 +36,7 @@ jobs:

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

- 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.4
uses: actions/checkout@v4.1.7

- 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.4
uses: actions/checkout@v4.1.7
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
Expand Up @@ -2,6 +2,6 @@ source "https://rubygems.org"
ruby "3.3.0"

gem "fastlane", "2.222.0"
gem "rexml", ">= 3.3.2"
gem "rexml", ">= 3.3.3"

eval_gemfile("fastlane/Pluginfile")
10 changes: 5 additions & 5 deletions androidHyperskillApp/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.960.0)
aws-partitions (1.962.0)
aws-sdk-core (3.201.3)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
Expand All @@ -19,7 +19,7 @@ GEM
aws-sdk-kms (1.88.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sigv4 (~> 1.5)
aws-sdk-s3 (1.156.0)
aws-sdk-s3 (1.157.0)
aws-sdk-core (~> 3, >= 3.201.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.5)
Expand Down Expand Up @@ -133,7 +133,7 @@ GEM
google-apis-core (>= 0.11.0, < 2.a)
google-apis-storage_v1 (0.31.0)
google-apis-core (>= 0.11.0, < 2.a)
google-cloud-core (1.7.0)
google-cloud-core (1.7.1)
google-cloud-env (>= 1.0, < 3.a)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
Expand Down Expand Up @@ -178,7 +178,7 @@ GEM
trailblazer-option (>= 0.1.1, < 0.2.0)
uber (< 0.2.0)
retriable (3.1.2)
rexml (3.3.2)
rexml (3.3.4)
strscan
rouge (2.0.7)
ruby2_keywords (0.0.5)
Expand Down Expand Up @@ -225,7 +225,7 @@ PLATFORMS
DEPENDENCIES
fastlane (= 2.222.0)
fastlane-plugin-firebase_app_distribution
rexml (>= 3.3.2)
rexml (>= 3.3.3)

RUBY VERSION
ruby 3.3.0p0
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
My Hyperskill
Hyperskill: Learn to Code
2 changes: 1 addition & 1 deletion androidHyperskillApp/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<uses-permission android:name="android.permission.DETECT_SCREEN_CAPTURE" />

<application
android:label="@string/android_app_name"
android:label="@string/app_name"
android:name=".HyperskillApp"
android:allowBackup="false"
android:supportsRtl="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ class AuthCredentialsFragment :
requireRouter().backTo(AuthSocialScreen())
}

viewBinding.signInToTextView.text = getString(
SharedRes.string.auth_sign_up_title,
getString(SharedRes.string.android_app_name)
)
viewBinding.signInToTextView.text = getString(SharedRes.string.auth_sign_up_title)
viewBinding.root.addKeyboardVisibilityListener { isVisible ->
if (!isAdded) return@addKeyboardVisibilityListener
viewBinding.signInHyperskillLogoShapeableImageView.isVisible = !isVisible
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,9 @@ class AuthSocialFragment :

viewBinding.signInToTextView.text =
if (isInSignUpMode) {
getString(
SharedRes.string.auth_sign_up_title,
getString(SharedRes.string.android_app_name)
)
getString(SharedRes.string.auth_sign_up_title)
} else {
getString(
SharedRes.string.auth_log_in_title,
getString(SharedRes.string.android_app_name)
)
getString(SharedRes.string.auth_log_in_title)
}

authMaterialCardViewsAdapter.items = listOf(
Expand Down
Loading

0 comments on commit 33d5125

Please sign in to comment.