From 65150ceb4fb3e867fd09ec0dd7a87f28a86b12c1 Mon Sep 17 00:00:00 2001 From: Altonss <66519591+altonss@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:21:55 +0100 Subject: [PATCH] Release 2.2.2 --- app/build.gradle | 10 +++++++--- app/src/main/res/xml/changelog_master.xml | 7 +++++++ app/witness.gradle | 5 ++--- build.gradle | 3 +-- fastlane/metadata/android/en-US/changelogs/124.txt | 2 +- fastlane/metadata/android/en-US/changelogs/126.txt | 2 ++ 6 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/126.txt diff --git a/app/build.gradle b/app/build.gradle index 4f62aa7b7..6e2a53125 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ apply from: 'witness.gradle' android { defaultConfig { - versionCode 125 - versionName "2.2.1" + versionCode 126 + versionName "2.2.2" applicationId "de.grobox.liberario" minSdkVersion 21 @@ -142,10 +142,14 @@ dependencies { exclude module: 'failureaccess' exclude group: 'com.google.j2objc' } - implementation('com.gitlab.opentransitmap:public-transport-enabler:c64494b1') { + implementation('com.gitlab.opentransitmap:public-transport-enabler:7f29ab5fc5a02f71e044c5623117741e36e73d3f') { exclude group: 'com.google.guava' // included above exclude group: 'org.json', module: 'json' // provided by Android exclude group: 'net.sf.kxml', module: 'kxml2' // provided by Android + exclude group: 'org.slf4j', module: 'slf4j-api' // v. 2.0.16 broken + } + constraints { + implementation 'org.slf4j:slf4j-api:2.0.9' // Force version 2.0.9 for now } debugImplementation 'org.slf4j:slf4j-api:1.7.32' debugImplementation 'com.github.tony19:logback-android:1.1.1-12' diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml index ba2a41ccd..6923e74b7 100644 --- a/app/src/main/res/xml/changelog_master.xml +++ b/app/src/main/res/xml/changelog_master.xml @@ -2,6 +2,13 @@ + + IMPORTANT! Remove all remaining Navitia-based networks (due to shutdown of API): all regions in France, Spain, Italy and nationwide Australia network + Various UI fixes and improvements + + diff --git a/app/witness.gradle b/app/witness.gradle index 29acabf9c..24a14536f 100644 --- a/app/witness.gradle +++ b/app/witness.gradle @@ -85,11 +85,11 @@ dependencyVerification { 'androidx.viewpager:viewpager:1.0.0:viewpager-1.0.0.aar:147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682', 'com.github.omadahealth:swipy:1.2.3:swipy-1.2.3.aar:63bff6e181742e3e243c29b595062ca65b4274bf7033c65460924f64f65c01e0', 'com.github.tony19:logback-android:1.1.1-12:logback-android-1.1.1-12.aar:3102228f0e408e3c003b34e96a604e9b9f59d314dcf8f03aa78d9d3648198932', - 'com.gitlab.opentransitmap:public-transport-enabler:c64494b1:public-transport-enabler-c64494b1.jar:d707f9556ed29102db596808fc1a18c8b458fd65e5e9d41d046afb1c830571a8', + 'com.gitlab.opentransitmap:public-transport-enabler:7f29ab5fc5a02f71e044c5623117741e36e73d3f:public-transport-enabler-7f29ab5fc5a02f71e044c5623117741e36e73d3f.jar:5ca9150f8e3ad7970de3d2ae6f367991cf229ee5e4cdb9be3cbe0b50609d10a4', 'com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.0:accessibility-test-framework-2.0.jar:cdf16ef8f5b8023d003ce3cc1b0d51bda737762e2dab2fedf43d1c4292353f7f', + 'com.google.android.flexbox:flexbox:3.0.0:flexbox-3.0.0.aar:5e19500486fd7c8e2e8c7aad6bbba9c8d0ada7057c6b32b9b5c61439814e7574', 'com.google.android.material:material:1.0.0:material-1.0.0.aar:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc', 'com.google.android.material:material:1.5.0:material-1.5.0.aar:b14dc96f95085f26f36aab703b2f791d136b71e91d5e80f0a0364531074a69c7', - 'com.google.android.flexbox:flexbox:3.0.0:flexbox-3.0.0.aar:5e19500486fd7c8e2e8c7aad6bbba9c8d0ada7057c6b32b9b5c61439814e7574', 'com.google.auto.value:auto-value-annotations:1.6.3:auto-value-annotations-1.6.3.jar:0e951fee8c31f60270bc46553a8586001b7b93dbb12aec06373aa99a150392c0', 'com.google.auto:auto-common:0.10:auto-common-0.10.jar:b876b5fddaceeba7d359667f6c4fb8c6f8658da1ab902ffb79ec9a415deede5f', 'com.google.code.findbugs:jsr305:2.0.1:jsr305-2.0.1.jar:1e7f53fa5b8b5c807e986ba335665da03f18d660802d8bf061823089d1bee468', @@ -180,7 +180,6 @@ dependencyVerification { 'org.ow2.asm:asm-commons:9.2:asm-commons-9.2.jar:be4ce53138a238bb522cd781cf91f3ba5ce2f6ca93ec62d46a162a127225e0a6', 'org.ow2.asm:asm-tree:9.2:asm-tree-9.2.jar:aabf9bd23091a4ebfc109c1f3ee7cf3e4b89f6ba2d3f51c5243f16b3cffae011', 'org.ow2.asm:asm:9.2:asm-9.2.jar:b9d4fe4d71938df38839f0eca42aaaa64cf8b313d678da036f0cb3ca199b47f5', - 'org.slf4j:slf4j-api:1.7.32:slf4j-api-1.7.32.jar:3624f8474c1af46d75f98bc097d7864a323c81b3808aa43689a6e1c601c027be', 'org.slf4j:slf4j-api:2.0.9:slf4j-api-2.0.9.jar:0818930dc8d7debb403204611691da58e49d42c50b6ffcfdce02dadb7c3c2b6c', 'org.xerial:sqlite-jdbc:3.25.2:sqlite-jdbc-3.25.2.jar:a45da61abed61568a533fdece125093180828edeb0d4b6f6d572e0cf457465f6', 'tools.fastlane:screengrab:2.1.1:screengrab-2.1.1.aar:5a02781c0986e71ddbc691263115c2db70bdebb4b48d5b6dcf06ab1cb547d62d', diff --git a/build.gradle b/build.gradle index ccdf781c7..7e0d5b991 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { @@ -23,7 +23,6 @@ allprojects { repositories { google() mavenCentral() - jcenter() maven { url 'https://jitpack.io' } } } diff --git a/fastlane/metadata/android/en-US/changelogs/124.txt b/fastlane/metadata/android/en-US/changelogs/124.txt index ec24687e8..f983ebdd6 100644 --- a/fastlane/metadata/android/en-US/changelogs/124.txt +++ b/fastlane/metadata/android/en-US/changelogs/124.txt @@ -3,4 +3,4 @@ * Fix minor issues on About page and with the time picker (thanks Altonss!) * Fix and re-add formerly broken regions: SBB (thanks Tobias!), VVO, AVV (Augsburg), GVH, VRS * Remove regions where information is no longer available: VOR, STV, VVV, SNCB, 9292, TFI -* Remove a long list of regions that are no longer served by Navitia \ No newline at end of file +* Remove regions that are no longer served by Navitia: Finland, Portugal, Hungary, Cz \ No newline at end of file diff --git a/fastlane/metadata/android/en-US/changelogs/126.txt b/fastlane/metadata/android/en-US/changelogs/126.txt new file mode 100644 index 000000000..fccc7b3a7 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/126.txt @@ -0,0 +1,2 @@ +* IMPORTANT! Remove all remaining Navitia-based networks (due to shutdown of API): all regions in France, Spain, Italy and nationwide Australia network +* Various UI fixes and improvements