Author: Adam Evyčędo <git@apiote.xyz>
release 3.7
CHANGELOG.adoc | 10 ++++++++++ README.adoc | 2 +- app/build.gradle.kts | 4 ++-- metadata/en-US/changelogs/32.txt | 2 ++ metadata/en/changelogs/32.txt | 2 ++ metadata/pl-PL/changelogs/32.txt | 2 ++ release.sh | 12 ++++++++++--
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index eaf4987492797d556a095a211eee2fbebc873db6..752ca17fa23bfb6f4fe112ab5b255bf899742ada 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -18,6 +18,16 @@ == [3.6.1] – 2024-09-04 === Fixed +* phantom feed names in search results + +=== Added + +* stops and departures from Transitous + +== [3.6.1] – 2024-09-04 + +=== Fixed + * add empty default cache credentials == [3.6] – 2024-08-30 diff --git a/README.adoc b/README.adoc index b484f6d8db8a2df8d8fad83be524e87818df188e..0e385ff83cfed168c84862a4776cf1669e2959ad 100644 --- a/README.adoc +++ b/README.adoc @@ -4,7 +4,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later = Bimba Adam Evyčędo <me@apiote.xyz> -v3.6.1 2024-09-04 +v3.7.0 2024-10-15 :toc: Bimba is a FLOSS public transport passenger companion; a timetable in your pocket. diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8b29d375d964387398785cac9f4b90775b8a8d79..2048280d5c542d1f7157d718aa9dc8d64c8fb584 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,8 +19,8 @@ defaultConfig { applicationId = "xyz.apiote.bimba.czwek" minSdk = 21 targetSdk = 35 - versionCode = 31 - versionName = "3.6.1" + versionCode = 32 + versionName = "3.7.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" resourceConfigurations += listOf("en", "pl", "it", "de", "fr", "en-rUS") diff --git a/metadata/en/changelogs/32.txt b/metadata/en/changelogs/32.txt new file mode 100644 index 0000000000000000000000000000000000000000..f4add26464b804086eccfaebbaf8250a4b6d8452 --- /dev/null +++ b/metadata/en/changelogs/32.txt @@ -0,0 +1,2 @@ +* Added basic Transitous support +* Fixed phantom localities names in search results diff --git a/metadata/en-US/changelogs/32.txt b/metadata/en-US/changelogs/32.txt new file mode 100644 index 0000000000000000000000000000000000000000..f4add26464b804086eccfaebbaf8250a4b6d8452 --- /dev/null +++ b/metadata/en-US/changelogs/32.txt @@ -0,0 +1,2 @@ +* Added basic Transitous support +* Fixed phantom localities names in search results diff --git a/metadata/pl-PL/changelogs/32.txt b/metadata/pl-PL/changelogs/32.txt new file mode 100644 index 0000000000000000000000000000000000000000..4eaba3d3347c664e684ced97d5c921f52eda0670 --- /dev/null +++ b/metadata/pl-PL/changelogs/32.txt @@ -0,0 +1,2 @@ +* Dodano podstawową obsługę Transitous +* Naprawiono fantomowe nazwy lokalizacji w wynikach wyszukiwania diff --git a/release.sh b/release.sh index 62122ff378c7bd472d9e463b2b145ef1637b4669..528c6853c80625ca544bd4addf3b535280ea079b 100755 --- a/release.sh +++ b/release.sh @@ -62,13 +62,21 @@ latestCIstarted=$(echo "$latestCI" | grep -oE '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]+\+[0-9]{2}:[0-9]{2}' | head -n1) while [ "$latestCIstatus" != 'OK' ] && [ "$retry" = "1" ] do echo "latest CI started at $latestCIstarted result is $latestCIstatus, not OK" - echo "retry? [y/N]" + echo "retry? [y/N/s]" read -r decision - if [ "$decision" != 'y' ] + if [ "$decision" = 'N' ] then retry="0" exit 1 fi + if [ "$decision" = 's' ] + then + retry="0" + break + fi + latestCI=$(curl https://ci.apiote.xyz/toys/czwek-commitly/latest 2>/dev/null) + latestCIstatus=$(echo "$latestCI" | grep '<h2' | sed 's/<h2[^>]*>//' | sed 's|</h2>||' | grep -oE '[A-Z]+') + latestCIstarted=$(echo "$latestCI" | grep -oE '[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]+\+[0-9]{2}:[0-9]{2}' | head -n1) done currentVersionName=$(grep -Eo 'versionName = "[0-9\.]+"' app/build.gradle.kts | cut -d '=' -f2 | tr -d ' "')