Skip to content

Commit 0042345

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
Merge branch 'feature'
2 parents 2d17648 + cb36bee commit 0042345

File tree

376 files changed

+2454
-1431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+2454
-1431
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android:
1010
- extra-google-m2repository
1111
- extra-android-m2repository
1212
script:
13-
- TERM=dumb ./gradlew lint testDebugUnitTest jacocoTestDebugUnitTestReport
13+
- TERM=dumb ./gradlew lint testDebugUnitTest jacocoTestReport
1414
before_install:
1515
- chmod +x gradlew
1616
- yes | sdkmanager "platforms;android-28"

‎README.md‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,18 @@ WiFi Analyzer is licensed under the GNU General Public License v3.0 (GPLv3).
118118

119119
### Running unit tests and jacoco coverage report
120120
```
121-
./gradlew lint testDebugUnitTest jacocoTestDebugUnitTestReport
121+
./gradlew lint testDebugUnitTest jacocoTestReport
122122
```
123123

124+
- lint report: `app/build/reports/lint-results.html`
125+
- unit test report: `app/build/reports/tests/testDebugUnitTest/index.html`
126+
- code coverage report: `app/build/reports/jacoco/jacocoTestReport/html/index.html`
127+
124128
## Special Thanks
125129

126130
We want to express our gratitude to all people for contributed with patches, bug solving and updates to WiFi Analyzer.
127131

132+
128133
## Donations
129134

130135
If you would like to contribute financially to the project please feel free to send any amount through paypal.

‎app/build.gradle‎

Lines changed: 33 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* WiFiAnalyzer
3-
* Copyright (C) 2018 VREM Software Development <[email protected]>
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by
@@ -17,22 +17,46 @@
1717
*/
1818

1919
apply plugin: "com.android.application"
20-
apply plugin: "jacoco-android"
20+
21+
apply from: "jacoco.gradle"
2122

2223
ext {
2324
supportVersion = "28.0.0"
24-
lang3Version = "3.8.1"
25-
collections4Version = "4.2"
25+
lang3Version = "3.9"
26+
collections4Version = "4.3"
2627
graphviewVersion = "4.2.2"
27-
powermockVersion = "1.7.4"
28-
robolectricVersion = "4.0"
28+
powermockVersion = "2.0.0"
29+
robolectricVersion = "4.1"
2930
junitVersion = "4.12"
3031
junitToolboxVersion = "2.4"
31-
shadowsVersion ="3.4-rc2"
3232
espressoVersion = "3.0.2"
3333
testVersion = "1.0.2"
3434
}
3535

36+
// dependencies -------------------------------------------------
37+
dependencies {
38+
// Compile Build Dependencies
39+
implementation fileTree(include: ["*.jar"], dir: "libs")
40+
implementation "com.android.support:design:$supportVersion"
41+
implementation "com.android.support:preference-v7:$supportVersion"
42+
implementation "com.android.support:support-v4:$supportVersion"
43+
implementation "com.android.support:support-media-compat:$supportVersion"
44+
implementation "org.apache.commons:commons-lang3:$lang3Version"
45+
implementation "org.apache.commons:commons-collections4:$collections4Version"
46+
implementation "com.jjoe64:graphview:$graphviewVersion"
47+
// Unit Test Dependencies
48+
testImplementation "junit:junit:$junitVersion"
49+
testImplementation "org.powermock:powermock-module-junit4:$powermockVersion"
50+
testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
51+
testImplementation "com.googlecode.junit-toolbox:junit-toolbox:$junitToolboxVersion"
52+
testImplementation "org.robolectric:robolectric:$robolectricVersion"
53+
testImplementation "org.robolectric:shadows-supportv4:$robolectricVersion"
54+
// Android Test Dependencies
55+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
56+
androidTestImplementation "com.android.support.test:runner:$testVersion"
57+
androidTestImplementation "com.android.support.test:rules:$testVersion"
58+
}
59+
3660
android {
3761
compileSdkVersion 28
3862
buildToolsVersion "28.0.3"
@@ -86,21 +110,7 @@ android {
86110
}
87111
}
88112

89-
jacoco {
90-
toolVersion = "0.8.2"
91-
}
92-
93-
tasks.withType(Test) {
94-
jacoco.includeNoLocationClasses = true
95-
}
96-
97-
jacocoAndroidUnitTestReport {
98-
excludes += ["**/com/jjoe64/*"]
99-
html.enabled true
100-
xml.enabled true
101-
csv.enabled false
102-
}
103-
113+
// keystore -------------------------------------------------
104114
if (project.hasProperty("keyAlias")) {
105115
def propertiesFile = file("../../keystores/androidkeystore.properties")
106116
Properties properties = readProperties(propertiesFile)
@@ -112,29 +122,7 @@ if (project.hasProperty("keyAlias")) {
112122
android.buildTypes.release.signingConfig.storePassword = properties["store_password"].toString()
113123
}
114124

115-
dependencies {
116-
// Compile Build Dependencies
117-
implementation fileTree(include: ["*.jar"], dir: "libs")
118-
implementation "com.android.support:design:$supportVersion"
119-
implementation "com.android.support:preference-v7:$supportVersion"
120-
implementation "com.android.support:support-v4:$supportVersion"
121-
implementation "com.android.support:support-media-compat:$supportVersion"
122-
implementation "org.apache.commons:commons-lang3:$lang3Version"
123-
implementation "org.apache.commons:commons-collections4:$collections4Version"
124-
implementation "com.jjoe64:graphview:$graphviewVersion"
125-
// Unit Test Dependencies
126-
testImplementation "junit:junit:$junitVersion"
127-
testImplementation "org.powermock:powermock-module-junit4:$powermockVersion"
128-
testImplementation "org.powermock:powermock-api-mockito2:$powermockVersion"
129-
testImplementation "com.googlecode.junit-toolbox:junit-toolbox:$junitToolboxVersion"
130-
testImplementation "org.robolectric:robolectric:$robolectricVersion"
131-
testImplementation "org.robolectric:shadows-support-v4:$shadowsVersion"
132-
// Android Test Dependencies
133-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion"
134-
androidTestImplementation "com.android.support.test:runner:$testVersion"
135-
androidTestImplementation "com.android.support.test:rules:$testVersion"
136-
}
137-
125+
// version -------------------------------------------------
138126
updateVersion()
139127

140128
def updateVersion() {

‎app/build.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Build Properties
2-
#Sat Nov 24 09:14:14 EST 2018
2+
#Fri Apr 19 15:29:57 EDT 2019
33
version_minor=0
4-
version_build=0
4+
version_build=29
55
version_patch=3
6-
version_store=44
76
version_major=2
7+
version_store=44

‎app/jacoco.gradle‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/*
2+
* WiFiAnalyzer
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version.
9+
*
10+
* This program is distributed in the hope that it will be useful,
11+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
12+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13+
* GNU General Public License for more details.
14+
*
15+
* You should have received a copy of the GNU General Public License
16+
* along with this program. If not, see <http://www.gnu.org/licenses/>
17+
*/
18+
19+
apply plugin: "jacoco"
20+
21+
tasks.withType(Test) {
22+
jacoco.includeNoLocationClasses = true
23+
}
24+
25+
task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
26+
27+
reports {
28+
xml.enabled = true
29+
html.enabled = true
30+
}
31+
32+
def fileFilter = [
33+
'**/R.class',
34+
'**/R$*.class',
35+
'**/BuildConfig.*',
36+
'**/Manifest*.*',
37+
'**/*Test*.*',
38+
'android/**/*.*',
39+
'**/com/jjoe64/*'
40+
]
41+
def classDir = "$project.buildDir/intermediates/javac/debug/compileDebugJavaWithJavac/classes"
42+
def mainSrc = "$project.projectDir/src/main/java"
43+
def debugTree = fileTree(dir: classDir, excludes: fileFilter)
44+
45+
sourceDirectories = files([mainSrc])
46+
classDirectories = files([debugTree])
47+
executionData = fileTree(dir: project.buildDir, includes: [
48+
'jacoco/testDebugUnitTest.exec',
49+
'outputs/code-coverage/connected/*coverage.ec'
50+
])
51+
}

‎app/src/androidTest/java/com/vrem/wifianalyzer/Filter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* WiFiAnalyzer
3-
* Copyright (C) 2018 VREM Software Development <[email protected]>
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎app/src/androidTest/java/com/vrem/wifianalyzer/InstrumentedUtils.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* WiFiAnalyzer
3-
* Copyright (C) 2018 VREM Software Development <[email protected]>
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎app/src/androidTest/java/com/vrem/wifianalyzer/MainInstrumentedTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* WiFiAnalyzer
3-
* Copyright (C) 2018 VREM Software Development <[email protected]>
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎app/src/androidTest/java/com/vrem/wifianalyzer/Navigation.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* WiFiAnalyzer
3-
* Copyright (C) 2018 VREM Software Development <[email protected]>
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

‎app/src/androidTest/java/com/vrem/wifianalyzer/Scanner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* WiFiAnalyzer
3-
* Copyright (C) 2018 VREM Software Development <[email protected]>
3+
* Copyright (C) 2019 VREM Software Development <[email protected]>
44
*
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)