Merge branch 'release/5.251.0'

Author: github-actions[bot]

.editorconfig

@@ -45,7 +45,7 @@ ij_kotlin_field_annotation_wrap = normal
 ij_kotlin_finally_on_new_line = false
 ij_kotlin_if_rparen_on_new_line = true
 ij_kotlin_import_nested_classes = true
-ij_kotlin_imports_layout = *, java.**, javax.**, kotlin.**, ^
+ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^
 ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
 ij_kotlin_keep_blank_lines_before_right_brace = 0
 ij_kotlin_keep_blank_lines_in_code = 1
@@ -91,3 +91,8 @@ ij_kotlin_while_on_new_line = false
 ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 1
 ij_kotlin_wrap_first_method_in_call_chain = false
+ktlint_standard_no-wildcard-imports = disabled
+ktlint_standard_filename = disabled
+ktlint_standard_package-name = disabled
+ktlint_standard_annotation = disabled
+ktlint_standard_kdoc-wrapping = disabled

.githooks/pre-commit

@@ -2,6 +2,5 @@
  #!/bin/bash
  echo "Running spotless check"
  ./gradlew spotlessApply
- ./gradlew formatKotlin
  git add `git diff --name-only --cached`
  exit 0

.github/workflows/ci.yml

@@ -27,6 +27,7 @@ jobs:
  - name: Checkout repository
  uses: actions/checkout@v4
  with:
+ fetch-depth: 0 # required due to setting Spotless ratchetFrom
  submodules: recursive
 
  - name: Set up JDK version
@@ -39,7 +40,7 @@ jobs:
  uses: gradle/actions/setup-gradle@v3
 
  - name: Run Code Formatting Checks
- run: ./gradlew code_format_checks
+ run: ./gradlew spotlessCheck
 
  unit_tests:
  name: Unit tests

.github/workflows/input-screen-e2e-tests.yml

@@ -1,8 +1,6 @@
 name: Input Screen End-to-End tests
 
 on:
- schedule:
- - cron: '0 5 * * *' # run at 5 AM UTC
  workflow_dispatch:
 
 concurrency:
@@ -48,11 +46,11 @@ jobs:
  uses: gradle/actions/setup-gradle@v3
 
  - name: Assemble the project
- run: ./gradlew assembleInternalRelease -Pforce-default-variant
+ run: ./gradlew assemblePlayRelease -Pforce-default-variant
 
  - name: Move APK to new folder
  if: always()
- run: find . -name "*.apk" -exec mv '{}' apk/internalRelease.apk \;
+ run: find . -name "*.apk" -exec mv '{}' apk/playRelease.apk \;
 
  - name: Input Screen Maestro run
  uses: mobile-dev-inc/action-maestro-cloud@v1.9.8
@@ -62,7 +60,7 @@ jobs:
  project-id: ${{ vars.ROBIN_ANDROID_PROJECT_ID }}
  name: inputScreen_${{ github.sha }}
  timeout: ${{ vars.ROBIN_TIMEOUT_MINUTES }}
- app-file: apk/internalRelease.apk
+ app-file: apk/playRelease.apk
  android-api-level: 30
  workspace: .maestro
  include-tags: inputScreenTest

.github/workflows/nightly.yml

@@ -18,6 +18,7 @@ jobs:
  - name: Checkout repository
  uses: actions/checkout@v4
  with:
+ fetch-depth: 0 # required due to setting Spotless ratchetFrom
  submodules: recursive
 
  - name: Set up JDK version
@@ -30,7 +31,7 @@ jobs:
  uses: gradle/actions/setup-gradle@v3
 
  - name: Run Code Formatting Checks
- run: ./gradlew code_format_checks
+ run: ./gradlew spotlessCheck
 
  unit_tests:
  name: Unit tests

.gitignore

@@ -41,9 +41,10 @@ captures/
 
 # Intellij
 *.iml
-.idea/
-.idea/workspace.xml
+.idea/*
 !.idea/icon.svg
+!.idea/copyright/
+.idea/workspace.xml
 
 # Keystore files
 *.jks

.maestro/input_screen/input_screen_chat_mode.yaml

@@ -0,0 +1,16 @@
+appId: com.duckduckgo.mobile.android
+name: "Input Screen Chat Mode test (bottom config)"
+tags:
+ - inputScreenTest
+ - releaseTest
+---
+- retry:
+ maxRetries: 3
+ commands:
+ - launchApp:
+ clearState: true
+ stopApp: true
+ - runFlow: ../shared/skip_all_onboarding.yaml
+ - runFlow: ./shared/input_screen_enable_flow.yaml
+ - runFlow: ./shared/input_screen_enable_bottom_bar_flow.yaml
+ - runFlow: ./shared/input_screen_chat_mode_flow.yaml

.maestro/input_screen/input_screen_chat_mode_bottom_config.yaml

@@ -0,0 +1,15 @@
+appId: com.duckduckgo.mobile.android
+name: "Input Screen Chat Mode test (top config)"
+tags:
+ - inputScreenTest
+ - releaseTest
+---
+- retry:
+ maxRetries: 3
+ commands:
+ - launchApp:
+ clearState: true
+ stopApp: true
+ - runFlow: ../shared/skip_all_onboarding.yaml
+ - runFlow: ./shared/input_screen_enable_flow.yaml
+ - runFlow: ./shared/input_screen_chat_mode_flow.yaml

.maestro/input_screen/input_screen_chat_mode_top_config.yaml

@@ -2,6 +2,7 @@ appId: com.duckduckgo.mobile.android
 name: "Input Screen user preferences test"
 tags:
  - inputScreenTest
+ - releaseTest
 ---
 - retry:
  maxRetries: 3