Merge branch 'main' into release

VREMSoftwareDevelopment · Oct 5, 2024 · 9be9ba7 · 9be9ba7
2 parents 4008dda + 164aba4
commit 9be9ba7
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 28 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -1,9 +1,9 @@
 name: "CodeQL"
 on:
   push:
-    branches: [ master, feature ]
+    branches: [ main, release ]
   pull_request:
-    branches: [ master, feature ]
+    branches: [ main, release ]
   schedule:
     - cron: '41 4 * * 2'
 jobs:

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,20 @@
+name: Mark stale issues and pull requests
+on:
+  schedule:
+    - cron: '* * 1 * *'
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        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.'
+          stale-pr-message: 'This pull request 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.'
+          stale-issue-label: 'stale'
+          stale-pr-label: 'stale'
+          exempt-issue-labels: 'bug,high-priority'
+          operations-per-run: 100
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,16 +13,15 @@
 
 - Make sure you are using the latest version of WiFiAnalyzer.
 - Please search issues to see if the same feature has already been submitted.
-- If an feature has already been opened, feel free to add more useful information to it. Oherwise, open a new feature request (one feature per request).
+- If an feature has already been opened, feel free to add more useful information to it. Otherwise, open a new feature
+  request (one feature per request).
 - Please provide an explanation how the feature solves the problem you are having.
 - UI feature request, please  describe what the UI would look like and how the user would interact with it.
 
 # Submit a pull request
 
 - When starting to work on a feature or bug that has been reported, please add a comment to it that you are working on it.
 - Fork the repository
-- Please make sure that you are using `feature` branch, since all the WiFiAnalyzer changes are done on the `feature` branch.
-- WiFiAnalyzer 'master' branch is only used to release new versions. As a result, the `master` branch most likely doesn't contain the latest changes.
 - To close a feature or a bug automatically, once pull request has been merged, please mention it in the [commit comment](https://help.github.com/articles/closing-issues-via-commit-messages/) or [pull request text](https://github.com/blog/1506-closing-issues-via-pull-requests).
 - Please avoid if possible large change sets.
 - Please do not forget to add unit tests.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,5 @@
 Thanks for sending a pull request!
 
-**Please make sure that you are using `feature` branch, since all the WiFi Analyzer changes are done on the `feature` branch!**
-
 [How to submit a pull request](https://github.com/VREMSoftwareDevelopment/WiFiAnalyzer/wiki/Pull-Request)
 
 **What does this implement/fix? Please describe.**

diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ WiFi Analyzer is licensed under the GNU General Public License v3.0 (GPLv3).
 
 [![Workflow Status](https://github.com/VREMSoftwareDevelopment/WiFiAnalyzer/workflows/Android%20CI/badge.svg)](https://github.com/VREMSoftwareDevelopment/WiFiAnalyzer/actions?query=workflow%3A%22Android+CI%22)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/203eaa0583694bcca6554190513179ba)](https://app.codacy.com/gh/VREMSoftwareDevelopment/WiFiAnalyzer/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)
-[![codecov](https://codecov.io/gh/VREMSoftwareDevelopment/WiFiAnalyzer/branch/master/graph/badge.svg)](https://codecov.io/gh/VREMSoftwareDevelopment/WiFiAnalyzer)
+[![codecov](https://codecov.io/gh/VREMSoftwareDevelopment/WiFiAnalyzer/branch/main/graph/badge.svg)](https://codecov.io/gh/VREMSoftwareDevelopment/WiFiAnalyzer)
 
 [![Known Vulnerabilities](https://snyk.io/test/github/vremsoftwaredevelopment/wifianalyzer/badge.svg)](https://snyk.io/test/github/vremsoftwaredevelopment/wifianalyzer)
 [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2FVREMSoftwareDevelopment%2FWiFiAnalyzer.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2FVREMSoftwareDevelopment%2FWiFiAnalyzer?ref=badge_shield)

diff --git a/app/build.gradle b/app/build.gradle
@@ -27,36 +27,37 @@ dependencies {
     // Compile Build Dependencies
     implementation fileTree(include: ["*.jar"], dir: "libs")
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.annotation:annotation:1.8.0'
+    implementation 'androidx.annotation:annotation:1.8.2'
     implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.collection:collection-ktx:1.4.0'
+    implementation 'androidx.collection:collection-ktx:1.4.4'
     implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.2'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6'
     implementation 'androidx.media:media:1.7.0'
     implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.jjoe64:graphview:4.2.2'
     // Unit Test Dependencies
-    testImplementation 'androidx.test.ext:junit:1.1.5'
+    testImplementation 'androidx.test.ext:junit:1.2.1'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:5.12.0'
-    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.3.1'
-    testImplementation 'org.robolectric:robolectric:4.12.2'
+    testImplementation 'org.mockito:mockito-core:5.14.1'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:5.4.0'
+    testImplementation 'org.robolectric:robolectric:4.13'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
-    testImplementation 'org.slf4j:slf4j-simple:2.0.13'
-    testImplementation 'org.assertj:assertj-core:3.26.0'
+    testImplementation 'org.slf4j:slf4j-simple:2.0.16'
+    testImplementation 'org.assertj:assertj-core:3.26.3'
     // Android Test Dependencies
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.2.1'
 }
 
 android {
     namespace 'com.vrem.wifianalyzer'
-    compileSdk 34
+    compileSdk 35
+    buildToolsVersion '35.0.0'
 
     sourceSets.each {
         it.java.srcDirs += "src/$it.name/kotlin"
@@ -65,7 +66,7 @@ android {
     defaultConfig {
         applicationId "com.vrem.wifianalyzer"
         minSdkVersion 24
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode
         versionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/build.properties b/app/build.properties
@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Jul 06 12:13:16 EDT 2024
-version_build=0
+#Sat Oct 05 10:11:19 EDT 2024
+version_build=6
 version_major=3
 version_minor=1
 version_patch=3

diff --git a/app/src/androidTest/kotlin/com/vrem/wifianalyzer/InstrumentedTestUtils.kt b/app/src/androidTest/kotlin/com/vrem/wifianalyzer/InstrumentedTestUtils.kt
@@ -30,7 +30,7 @@ internal class ChildAtPosition(private val parentMatcher: Matcher<View>, private
         parentMatcher.describeTo(description)
     }
 
-    public override fun matchesSafely(view: View): Boolean {
+    override fun matchesSafely(view: View): Boolean {
         val parent = view.parent
         return (parent is ViewGroup && parentMatcher.matches(parent) && view == parent.getChildAt(position))
     }

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -59,7 +59,7 @@
     <string name="graph_axis_y">"信号强度 (dBm)"</string>
 
     <!-- settings start -->
-    <string name="country_code_title">"国家"</string>
+    <string name="country_code_title">"国家 (或地区)"</string>
 
     <string name="scan_speed_title">"扫描间隔"</string>
     <string name="scan_speed_summary">"%s 秒"</string>

diff --git a/build.gradle b/build.gradle
@@ -20,14 +20,14 @@
 
 buildscript {
     ext {
-        kotlin_version = '2.0.0'
+        kotlin_version = '2.0.20'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.5.0'
+        classpath 'com.android.tools.build:gradle:8.7.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip