Author: Adam Evyčędo <git@apiote.xyz>
update dependencies, fixup build scripts
%!v(PANIC=String method: strings: negative Repeat count)
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 110065dbc9a8ee8a7cee69f67f3d7a0ddd3c736c..13f5de92b8b809310bd9215cb67fa241b4200fdc 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,10 +5,9 @@ plugins { id("com.android.application") kotlin("android") - id("org.jetbrains.kotlin.plugin.parcelize") - id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22" - id("com.mermake.locale-resource-generator") version "0.1" - id("com.google.protobuf") version "0.9.4" + kotlin("plugin.parcelize") + kotlin("plugin.serialization") + // id("com.mermake.locale-resource-generator") version "0.1.1" } android { @@ -66,14 +65,13 @@ implementation("com.google.openlocationcode:openlocationcode:1.0.4") implementation("org.osmdroid:osmdroid-android:6.1.18") implementation("org.yaml:snakeyaml:2.2") implementation("androidx.activity:activity-ktx:1.9.1") - implementation("com.google.openlocationcode:openlocationcode:1.0.4") implementation("com.otaliastudios:zoomlayout:1.9.0") implementation("dev.bandb.graphview:graphview:0.8.1") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.1") implementation("com.github.jershell:kbson:0.5.0") implementation("androidx.preference:preference-ktx:1.2.1") - implementation("androidx.work:work-runtime-ktx:2.9.0") - implementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.9.3") + implementation("androidx.work:work-runtime-ktx:2.9.1") + implementation("com.github.doyaaaaaken:kotlin-csv-jvm:1.10.0") implementation("commons-io:commons-io:2.16.1") implementation(project(":fruchtfleisch")) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index df18dfb966f5fd8c37c0893fa264b05f1a37ef6b..66a021e365d8b0f0506f6a62a283ce3d9d891df6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:enableOnBackInvokedCallback="true" android:fullBackupContent="@xml/backup_rules" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:localeConfig="@xml/locale_config" + android:localeConfig="@xml/locales_config" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Bimba.Style" diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt index 4e22e00b1b8365b32fc365f86c904dd74366651c..0d053162b88f3d4f2a65975d1d2cff92e2b979a4 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Departures.kt @@ -19,7 +19,7 @@ companion object { fun unmarshal(stream: InputStream): DeparturesResponse { val reader = Reader(stream) return when (val v = reader.readUInt().toULong()) { - 0UL -> DeparturesResponseDev.unmarshal(stream) + // 0UL -> DeparturesResponseDev.unmarshal(stream) 1UL -> DeparturesResponseV1.unmarshal(stream) 2UL -> DeparturesResponseV2.unmarshal(stream) 3UL -> DeparturesResponseV3.unmarshal(stream) diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt index 2188e29c3297dc5614ce30f40b4bb359a67781f0..3a42262c3955a75ef6245f6b17e8ceb88f03d429 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Locatables.kt @@ -21,7 +21,7 @@ companion object { fun unmarshal(stream: InputStream): LocatablesResponse { val reader = Reader(stream) return when (val v = reader.readUInt().toULong()) { - 0UL -> LocatablesResponseDev.unmarshal(stream) + // 0UL -> LocatablesResponseDev.unmarshal(stream) 1UL -> LocatablesResponseV1.unmarshal(stream) 2UL -> LocatablesResponseV2.unmarshal(stream) 3UL -> LocatablesResponseV3.unmarshal(stream) diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt index 216ab34e80475121dde939626338c14e59e382cb..8e7cc8f8c7a63204b4c2d69604ae33f2fe4ac768 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/api/responses/Queryables.kt @@ -22,7 +22,7 @@ companion object { fun unmarshal(stream: InputStream): QueryablesResponse { val reader = Reader(stream) return when (val v = reader.readUInt().toULong()) { - 0UL -> QueryablesResponseDev.unmarshal(stream) + // 0UL -> QueryablesResponseDev.unmarshal(stream) 1UL -> QueryablesResponseV1.unmarshal(stream) 2UL -> QueryablesResponseV2.unmarshal(stream) 3UL -> QueryablesResponseV3.unmarshal(stream) diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml new file mode 100644 index 0000000000000000000000000000000000000000..27e57b55cc383ece2b9d21fa54bca4717eee18c2 --- /dev/null +++ b/app/src/main/res/xml/locales_config.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<locale-config xmlns:android="http://schemas.android.com/apk/res/android"> + <locale android:name="en"/> + <locale android:name="pl"/> + <locale android:name="it"/> + <locale android:name="de"/> + <locale android:name="fr"/> + <locale android:name="en-rUS"/> +</locale-config> \ No newline at end of file diff --git a/app/src/release/java/xyz/apiote/bimba/czwek/api/responses/DevResponses.kt b/app/src/release/java/xyz/apiote/bimba/czwek/api/responses/DevResponses.kt index 8290582612b62aedbdcfdc18846921dd774b2d60..ff0bb2cb49a07b13f1b90518a772d06e5933e071 100644 --- a/app/src/release/java/xyz/apiote/bimba/czwek/api/responses/DevResponses.kt +++ b/app/src/release/java/xyz/apiote/bimba/czwek/api/responses/DevResponses.kt @@ -9,14 +9,11 @@ import xyz.apiote.bimba.czwek.api.DepartureV4 import xyz.apiote.bimba.czwek.api.LineV3 import xyz.apiote.bimba.czwek.api.ColourV1 import xyz.apiote.bimba.czwek.api.LineTypeV3 -import xyz.apiote.bimba.czwek.api.LocatableV3 -import xyz.apiote.bimba.czwek.api.QueryableV4 +import xyz.apiote.bimba.czwek.api.LocatableV4 import xyz.apiote.bimba.czwek.api.StopV2 import xyz.apiote.bimba.czwek.api.PositionV1 -import xyz.apiote.bimba.czwek.api.UnknownResourceVersionException -import xyz.apiote.bimba.czwek.api.VehicleV3 +import xyz.apiote.bimba.czwek.api.QueryableV5 import xyz.apiote.bimba.czwek.api.structs.FeedInfoV2 -import xyz.apiote.fruchtfleisch.Reader import java.io.InputStream data class DeparturesResponseDev( @@ -51,7 +48,7 @@ } } } -data class LocatablesResponseDev(val locatables: List<LocatableV3>) : LocatablesResponse { +data class LocatablesResponseDev(val locatables: List<LocatableV4>) : LocatablesResponse { companion object { private fun unmarshal(stream: InputStream): LocatablesResponseDev { return LocatablesResponseDev(listOf()) @@ -60,7 +57,7 @@ } } -data class QueryablesResponseDev(val queryables: List<QueryableV4>) : QueryablesResponse { +data class QueryablesResponseDev(val queryables: List<QueryableV5>) : QueryablesResponse { companion object { private fun unmarshal(stream: InputStream): QueryablesResponseDev { return QueryablesResponseDev(listOf()) diff --git a/build.gradle.kts b/build.gradle.kts index e8ce8c75f4060f8c19f074727d2ef4a8ee87618c..46c4cc081eaca93cfd488ae20a55802bb1a9de63 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,10 +4,10 @@ // SPDX-License-Identifier: GPL-3.0-or-later // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.5.0" apply false - id("com.android.library") version "8.5.0" apply false - id("org.jetbrains.kotlin.android") version "1.7.10" apply false - id("org.jetbrains.kotlin.jvm") version "1.7.20" apply false - id("org.jetbrains.kotlin.plugin.parcelize") version "1.8.20" apply false - id("org.jetbrains.kotlin.plugin.serialization") version "1.9.22" apply false + id("com.android.application") version "8.5.1" apply false + id("com.android.library") version "8.5.1" apply false + kotlin("android") version "2.0.10" apply false + kotlin("jvm") version "1.7.20" apply false + kotlin("plugin.parcelize") version "1.8.20" apply false + kotlin("plugin.serialization") version "1.9.22" apply false } diff --git a/fruchtfleisch/build.gradle.kts b/fruchtfleisch/build.gradle.kts index c75a2f1bae17a8e70807c69c0619d320767b1646..d8428614c918943ac054616ce6052d6d5a72fc33 100644 --- a/fruchtfleisch/build.gradle.kts +++ b/fruchtfleisch/build.gradle.kts @@ -4,12 +4,12 @@ // SPDX-License-Identifier: GPL-3.0-or-later plugins { id("java-library") - id("org.jetbrains.kotlin.jvm") + kotlin("jvm") } dependencies { - testImplementation("org.junit.jupiter:junit-jupiter:5.10.3") - testImplementation("org.junit.jupiter:junit-jupiter:5.10.3") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.0") + testImplementation("org.junit.jupiter:junit-jupiter:5.11.0") //implementation("org.jetbrains.kotlin:kotlin-reflect:1.8.10") } diff --git a/settings.gradle.kts b/settings.gradle.kts index 2085d26600350fa10f16897f55dd9ae80d75e73e..5549aa5de8f76511812ade32b3e90a17fd758c27 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,6 @@ repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { google() mavenCentral() - maven { url = uri("https://jitpack.io") } } } rootProject.name = "Bimba"