Merge branch 'main' into feature/sort-by-standard

Author: VREMSoftwareDevelopment

.github/actions/common-setup/action.yml

@@ -4,7 +4,7 @@ runs:
   using: 'composite'
   steps:
     - name: Set up JDK
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: zulu
         java-version: 21

.github/workflows/android-ci.yml

@@ -21,73 +21,83 @@ on:
 
 jobs:
   ktlint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/common-setup
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Common setup
+        uses: ./.github/actions/common-setup
       - name: ktlint check
         run: bash ./gradlew ktlintCheck --stacktrace
       - name: Upload ktlint report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: ktlint-report
           path: app/build/reports/ktlint
 
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/common-setup
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Common setup
+        uses: ./.github/actions/common-setup
       - name: lint
         run: bash ./gradlew lintDebug --stacktrace
       - name: Upload lint report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: lint-report
           path: app/build/reports/lint-results*.*
 
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/common-setup
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Common setup
+        uses: ./.github/actions/common-setup
       - name: unit tests
         run: bash ./gradlew testDebugUnitTest --stacktrace
       - name: Upload test results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: test-results
           path: app/build/reports/tests
 
   coverage:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: test
     steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/common-setup
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Common setup
+        uses: ./.github/actions/common-setup
       - name: coverage
         run: bash ./gradlew jacocoTestCoverageVerification --stacktrace
       - name: Upload JaCoCo report
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: jacoco-report
           path: app/build/reports/jacoco
       - name: upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v6
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./app/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml
 
   build-apk:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [ktlint, lint, test, coverage]
     steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/common-setup
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Common setup
+        uses: ./.github/actions/common-setup
       - name: build apk
         run: bash ./gradlew assembleDebug --stacktrace
       - name: artifact apk
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifact-apk
           path: app/build/outputs/apk/debug
@@ -100,7 +110,7 @@ jobs:
       matrix:
         api-level: [35]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/common-setup
       - name: Enable KVM
         run: |
@@ -110,7 +120,7 @@ jobs:
       - name: Gradle cache
         uses: gradle/actions/setup-gradle@v4
       - name: AVD cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         id: avd-cache
         with:
           path: |
@@ -131,13 +141,13 @@ jobs:
           api-level: ${{ matrix.api-level }}
           script: ./gradlew connectedDebugAndroidTest -x assembleDebug -x assembleDebugAndroidTest
       - name: Upload test results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         if: always()
         with:
           name: emulator-test-results-${{ matrix.api-level }}
           path: app/build/reports/androidTests
       - name: Publish test results
-        uses: mikepenz/action-junit-report@v5
+        uses: mikepenz/action-junit-report@v6
         if: always()
         with:
           report_paths: 'app/build/outputs/androidTest-results/connected/**/*.xml'

.github/workflows/close-empty-xml.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout PR branch
-        uses: actions/checkout@v3
+        uses: actions/checkout@v6
       - name: Fetch base branch
         run: |
           git fetch origin ${{ github.event.pull_request.base.ref }}

.github/workflows/codeql-analysis.yml

@@ -30,9 +30,9 @@ jobs:
         language: [ 'java-kotlin' ]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'zulu'
           java-version: '21'

.github/workflows/compare-src.yml

@@ -56,7 +56,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout WiFiAnalyzer
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           path: wifianalyzer
       - name: Clone target repository
@@ -99,7 +99,7 @@ jobs:
           find filtered_targetrepo -type f | sort > right_files.txt || true
           comm -3 left_files.txt right_files.txt > file_changes.txt || true
       - name: Upload diff and summary as artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: src-comparison
           path: |
@@ -128,12 +128,12 @@ jobs:
             echo "Warning: targetrepo/gradlew not found; proceeding without wrapper"
           fi
       - name: Set up JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '17'
       - name: Cache Gradle
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ~/.gradle/caches
@@ -162,7 +162,7 @@ jobs:
       - name: Upload APKs if present
         if: always()
         continue-on-error: true
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: targetrepo-apks
           path: |

.github/workflows/stale.yml

@@ -9,7 +9,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'

AGENTS.md

@@ -22,6 +22,17 @@ WiFiAnalyzer is an Android application for analyzing WiFi networks. It helps use
 | Code Style | ktlint |
 | License | GNU General Public License v3.0 (GPLv3) |
 
+clearAdditional repository-specific versions and toolchain (source-of-truth files shown):
+
+- Kotlin: 2.3.20 (top-level `build.gradle` ext.kotlin_version)
+- Android Gradle Plugin (AGP): 9.1.1 (top-level `build.gradle` classpath `com.android.tools.build:gradle:9.1.1`)
+ - Note: the top-level `build.gradle` also adds `gradlePluginPortal()` to repositories and includes additional classpath entries used by the build:
+   - `org.jetbrains.kotlin:kotlin-allopen:$kotlin_version`
+   - `com.github.ben-manes:gradle-versions-plugin:0.53.0`
+- Gradle wrapper: 9.4.1 (`gradle/wrapper/gradle-wrapper.properties` distributionUrl)
+- JDK: 21 is used in CI and repository setup (`.github/actions/common-setup/action.yml` and `.github/workflows/*` use setup-java with `java-version: 21`). Note: project `compileOptions` and `kotlinOptions.jvmTarget` are set to Java 17 in `app/build.gradle`.
+- Android compile/target SDK: compileSdk = 36, minSdk = 24 (see `app/build.gradle`).
+
 ## Project Structure
 
 ```
@@ -66,6 +77,10 @@ All source files must include the GPLv3 license header:
 Use ktlint for code formatting:
 - Check: `./gradlew ktlintCheck`
 - Format: `./gradlew ktlintFormat`
+ 
+Repository-specific ktlint notes:
+- Plugin configured in `app/build.gradle` as `org.jlleitschuh.gradle.ktlint` (version `14.2.0`).
+- Baseline and rules: see `app/config/ktlint/baseline.xml` and project `.editorconfig` for formatting rules.
 
 ## Testing Requirements
 
@@ -162,6 +177,22 @@ class MainActivityInstrumentedTest {
 | Run tests with coverage | `./gradlew jacocoTestCoverageVerification` |
 | Run instrumented tests | `./gradlew connectedDebugAndroidTest` |
 
+### CI / GitHub Actions (what the repo runs)
+
+- Workflows:
+  - `.github/workflows/android-ci.yml` — main Android CI pipeline (jobs: ktlint, lint, test, coverage, build-apk, emulator-test). Runners use `ubuntu-24.04` / `ubuntu-latest` and a composite action `.github/actions/common-setup` to install JDK 21 and Gradle.
+  - `.github/workflows/codeql-analysis.yml` — CodeQL analysis (language: `java-kotlin`, uses JDK 21).
+
+- Important CI details and artifact/report locations (useful for reproducing or debugging locally):
+  - ktlint report: `app/build/reports/ktlint` (CI uploads as `ktlint-report`).
+  - lint report: `app/build/reports/lint-results*.*` (CI uploads as `lint-report`).
+  - unit test reports: `app/build/reports/tests` (CI uploads as `test-results`). The unit test task invoked is `:app:testDebugUnitTest` / `./gradlew testDebugUnitTest`.
+  - JaCoCo report (CI expects the XML): `app/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml` (uploaded to Codecov using `secrets.CODECOV_TOKEN`).
+  - APK artifact: `app/build/outputs/apk/debug` (uploaded as `artifact-apk`).
+  - Instrumentation / emulator test outputs: `app/build/reports/androidTests` and `app/build/outputs/androidTest-results/connected/**/*.xml` for JUnit XMLs.
+
+- Emulator job notes: the GitHub Action enables KVM, caches AVD (`~/.android/avd/*`) and runs `./gradlew connectedDebugAndroidTest`. Emulator caching and KVM are required for the `emulator-test` job in `android-ci.yml`.
+
 ## Privacy and Security Guidelines
 
 1. **No Data Collection**: WiFiAnalyzer does not collect any personal/device information

app/build.gradle

@@ -33,7 +33,7 @@ dependencies {
     // Compile Build Dependencies
     implementation fileTree(include: ["*.jar"], dir: "libs")
     implementation 'com.google.android.material:material:1.13.0'
-    implementation 'androidx.annotation:annotation:1.9.1'
+    implementation 'androidx.annotation:annotation:1.10.0'
     implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'androidx.collection:collection-ktx:1.6.0'
     implementation 'androidx.core:core-ktx:1.18.0'

build.gradle

@@ -28,7 +28,7 @@ buildscript {
         gradlePluginPortal() // Added for plugin resolution
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:9.1.0'
+        classpath 'com.android.tools.build:gradle:9.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
         classpath "com.github.ben-manes:gradle-versions-plugin:0.53.0"