Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
VREMSoftwareDevelopment committed Jan 5, 2025
2 parents 9be9ba7 + 46f909e commit 9247c9a
Show file tree
Hide file tree
Showing 417 changed files with 868 additions and 694 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/android_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ jobs:
steps:
- name: checkout repository
uses: actions/checkout@v4
- name: set up JDK 17
- name: set up JDK 21
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: '17'
java-version: '21'
- name: lint
run: bash ./gradlew lintDebug --stacktrace
- name: unit tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ jobs:
stale-issue-label: 'stale'
stale-pr-label: 'stale'
exempt-issue-labels: 'bug,high-priority'
operations-per-run: 100
days-before-stale: 365
28 changes: 17 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -16,24 +16,29 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/

apply plugin: "com.android.application"
plugins {
id "com.android.application"
id "kotlin-android"
id "kotlin-allopen"
id "jacoco"
}

apply from: "jacoco.gradle"
apply plugin: "kotlin-android"
apply plugin: "kotlin-allopen"
apply {
from "jacoco.gradle"
}

// dependencies -------------------------------------------------
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.2'
implementation 'androidx.annotation:annotation:1.9.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'androidx.collection:collection-ktx:1.4.4'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.collection:collection-ktx:1.4.5'
implementation 'androidx.core:core-ktx:1.15.0'
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.6'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7'
implementation 'androidx.media:media:1.7.0'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
Expand All @@ -42,9 +47,9 @@ dependencies {
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.14.1'
testImplementation 'org.mockito:mockito-core:5.14.2'
testImplementation 'org.mockito.kotlin:mockito-kotlin:5.4.0'
testImplementation 'org.robolectric:robolectric:4.13'
testImplementation 'org.robolectric:robolectric:4.14.1'
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
testImplementation 'org.slf4j:slf4j-simple:2.0.16'
Expand Down Expand Up @@ -97,6 +102,7 @@ android {
unitTests {
includeAndroidResources true
all {
jvmArgs("-XX:+EnableDynamicAgentLoading")
testLogging {
events "passed", "skipped", "failed", "standardOut", "standardError"
outputs.upToDateWhen { false }
Expand Down
4 changes: 2 additions & 2 deletions app/build.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Build Properties
#Sat Oct 05 10:11:19 EDT 2024
version_build=6
#Sun Jan 05 11:22:35 EST 2025
version_build=11
version_major=3
version_minor=1
version_patch=3
Expand Down
6 changes: 2 additions & 4 deletions app/jacoco.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -16,10 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/

apply plugin: "jacoco"

jacoco {
toolVersion = "0.8.11"
toolVersion = "0.8.12"
}

def executionPath = 'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ WiFiAnalyzer
~ Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
~ Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
~
~ This program is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/annotation/OpenClass.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/util/BuildUtils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/util/CompatUtils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/util/EnumUtils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/util/FileUtils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/util/LocaleUtils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/util/StringUtils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/wifianalyzer/ActivityUtils.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/wifianalyzer/MainContext.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/wifianalyzer/MainReload.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/vrem/wifianalyzer/export/Export.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* WiFiAnalyzer
* Copyright (C) 2015 - 2024 VREM Software Development <[email protected]>
* Copyright (C) 2015 - 2025 VREM Software Development <[email protected]>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down
Loading

0 comments on commit 9247c9a

Please sign in to comment.