Skip to content

Commit b6200ab

Browse files
authored
Merge pull request #83 from SlaVcE14/dev
V1.9
2 parents 5df6f4e + 2122e39 commit b6200ab

28 files changed

Lines changed: 1111 additions & 633 deletions

.github/workflows/codeql.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,10 @@ jobs:
5555

5656
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5757
# If this step fails, then you should remove it and run the build manually (see below)
58-
- name: Autobuild
59-
uses: github/codeql-action/autobuild@v2
58+
- name: Build project
59+
run: |
60+
chmod +x gradlew
61+
./gradlew build --no-daemon
6062
6163
# ℹ️ Command-line programs to run using the OS shell.
6264
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

.github/workflows/coreUnitTests.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,27 @@ jobs:
3030
if: always()
3131
run: |
3232
echo "### Unit Test Summary" >> $GITHUB_STEP_SUMMARY
33+
3334
TEST_RESULTS=$(find core/build/test-results/test -name "*.xml")
35+
36+
# Count total tests, failures, skipped
3437
PASSED=$(grep -o 'testsuite.*tests="[^"]*"' $TEST_RESULTS | sed -n 's/.*tests="\([0-9]*\)".*/\1/p' | awk '{s+=$1} END {print s}')
3538
FAILURES=$(grep -o 'testsuite.*failures="[^"]*"' $TEST_RESULTS | sed -n 's/.*failures="\([0-9]*\)".*/\1/p' | awk '{s+=$1} END {print s}')
3639
SKIPPED=$(grep -o 'testsuite.*skipped="[^"]*"' $TEST_RESULTS | sed -n 's/.*skipped="\([0-9]*\)".*/\1/p' | awk '{s+=$1} END {print s}')
40+
3741
echo "- ✅ Passed: $((PASSED - FAILURES - SKIPPED))" >> $GITHUB_STEP_SUMMARY
3842
echo "- ❌ Failed: $FAILURES" >> $GITHUB_STEP_SUMMARY
3943
echo "- ⏭️ Skipped: $SKIPPED" >> $GITHUB_STEP_SUMMARY
44+
45+
# Show detailed failure messages
46+
if [ "$FAILURES" -gt 0 ]; then
47+
echo "### ❌ Test Failures" >> $GITHUB_STEP_SUMMARY
48+
for file in $TEST_RESULTS; do
49+
# Extract <testcase> elements with <failure> inside
50+
grep -Poz '<testcase[^>]*>\K.*?(?=</testcase>)' "$file" | grep -Poz '<failure[^>]*>.*?</failure>' | while read -r line; do
51+
MSG=$(echo "$line" | sed -E 's/<failure[^>]*>(.*)<\/failure>/\1/' | tr -d '\n')
52+
TESTNAME=$(echo "$file" | sed 's#.*/##')
53+
echo "- $TESTNAME: $MSG" >> $GITHUB_STEP_SUMMARY
54+
done
55+
done
56+
fi

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ Introducing a Material You Android application for previewing JSON from a file o
44

55
[<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
66
alt="Get it on Google Play"
7-
height="80">](https://play.google.com/store/apps/details?id=com.sjapps.jsonlist)
7+
height="80">](https://redirect.sj14apps.com/jsonlist-play)
88
[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
99
alt="Get it on F-Droid"
10-
height="80">](https://slavce14.github.io/redirect?link=jsonlist-fdroid)
10+
height="80">](https://redirect.sj14apps.com/jsonlist-fdroid)
1111
[<img src="https://gitlab.com/IzzyOnDroid/repo/-/raw/master/assets/IzzyOnDroid.png"
1212
alt="Get it on IzzyOnDroid"
13-
height="80">](https://slavce14.github.io/redirect?link=jsonlist-izzy)
13+
height="80">](https://redirect.sj14apps.com/jsonlist-izzy)
1414

1515
[![Packaging status](https://repology.org/badge/vertical-allrepos/android%3Ajson-list.svg)](https://repology.org/project/android%3Ajson-list/versions)
1616

1717
Or download the latest APK from the [Releases Section](https://github.com/SlaVcE14/JsonList/releases/latest).
1818

19-
[Desktop app coming soon..](https://github.com/SlaVcE14/JsonList-Desktop)
19+
[Desktop app coming soon..](https://redirect.sj14apps.com/jsonlist-desktop-github)
2020

2121
![JsonList](images/jsonlist_main.jpg)
2222

app/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ android {
99
applicationId "com.sjapps.jsonlist"
1010
minSdk 23
1111
targetSdk 36
12-
versionCode 51
13-
versionName "1.8"
12+
versionCode 900
13+
versionName "1.9"
1414

1515
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1616
vectorDrawables.generatedDensities = []
@@ -25,6 +25,10 @@ android {
2525
cruncherEnabled = false
2626
}
2727

28+
buildFeatures {
29+
viewBinding true
30+
}
31+
2832
buildTypes {
2933
release {
3034
minifyEnabled false
@@ -33,7 +37,7 @@ android {
3337
}
3438
debug {
3539
applicationIdSuffix '.debug'
36-
versionNameSuffix ' dev 5'
40+
versionNameSuffix ' dev'
3741
}
3842
}
3943
compileOptions {

0 commit comments

Comments
 (0)