fix favoruties issue + dependency updates

joreilly · Jun 23, 2024 · e49aac1 · e49aac1
1 parent b43f686
commit e49aac1
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 12 deletions.
diff --git a/SharedCode/src/commonMain/kotlin/com/surrus/galwaybus/common/GalwayBusRepository.kt b/SharedCode/src/commonMain/kotlin/com/surrus/galwaybus/common/GalwayBusRepository.kt
@@ -41,8 +41,8 @@ open class GalwayBusRepository : KoinComponent {
     val favorites = appSettings.favorites
 
     val favoriteBusStopList = busStops.combine(favorites) { busStops, favorites ->
-        Logger.i { "getBusStopsFlow().combine, favorites = $favorites, busStops size = ${busStops.size}" }
-        favorites.map { favorite -> busStops.firstOrNull { it.stop_id == favorite } }.filterNotNull()
+        Logger.i { "favoriteBusStopList, favorites = $favorites, busStops size = ${busStops.size}" }
+        favorites.map { favorite -> busStops.firstOrNull { it.stopRef == favorite } }.filterNotNull()
     }
 
     suspend fun fetchAndStoreBusStops() {

diff --git a/android-app/build.gradle.kts b/android-app/build.gradle.kts
@@ -154,3 +154,8 @@ dependencies {
     implementation(project(":SharedCode"))
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
diff --git a/android-app/proguard-rules.pro b/android-app/proguard-rules.pro
@@ -77,3 +77,88 @@
 -dontwarn org.jetbrains.annotations.NotNull
 
 -dontwarn org.slf4j.impl.StaticLoggerBinder
+
+
+
+-dontwarn com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
+-dontwarn com.fasterxml.jackson.dataformat.xml.XmlMapper
+-dontwarn com.sun.org.apache.xml.internal.utils.PrefixResolver
+-dontwarn java.beans.BeanInfo
+-dontwarn java.beans.IndexedPropertyDescriptor
+-dontwarn java.beans.IntrospectionException
+-dontwarn java.beans.Introspector
+-dontwarn java.beans.MethodDescriptor
+-dontwarn java.beans.PropertyDescriptor
+-dontwarn javax.swing.tree.TreeNode
+-dontwarn org.apache.xml.utils.PrefixResolver
+-dontwarn org.jaxen.FunctionContext
+-dontwarn org.jaxen.NamespaceContext
+-dontwarn org.jaxen.Navigator
+-dontwarn org.jaxen.VariableContext
+-dontwarn org.jaxen.XPathFunctionContext
+-dontwarn org.jaxen.dom.DocumentNavigator
+-dontwarn org.jetbrains.dokka.CoreExtensions
+-dontwarn org.jetbrains.dokka.DokkaConfiguration$DokkaSourceSet
+-dontwarn org.jetbrains.dokka.DokkaConfiguration$PluginConfiguration
+-dontwarn org.jetbrains.dokka.DokkaConfiguration$SerializationFormat
+-dontwarn org.jetbrains.dokka.DokkaConfiguration
+-dontwarn org.jetbrains.dokka.DokkaSourceSetID
+-dontwarn org.jetbrains.dokka.Platform
+-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.DocumentableSourceLanguageParser
+-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
+-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.ModuleAndPackageDocumentationReader
+-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.SampleProviderFactory
+-dontwarn org.jetbrains.dokka.generation.Generation
+-dontwarn org.jetbrains.dokka.links.Callable
+-dontwarn org.jetbrains.dokka.links.DRI
+-dontwarn org.jetbrains.dokka.links.DriTarget
+-dontwarn org.jetbrains.dokka.model.Annotations$Annotation
+-dontwarn org.jetbrains.dokka.model.Annotations$AnnotationScope
+-dontwarn org.jetbrains.dokka.model.DisplaySourceSet
+-dontwarn org.jetbrains.dokka.model.DisplaySourceSetKt
+-dontwarn org.jetbrains.dokka.model.ExtraModifiers$KotlinOnlyModifiers$External
+-dontwarn org.jetbrains.dokka.model.ExtraModifiers$KotlinOnlyModifiers$TailRec
+-dontwarn org.jetbrains.dokka.model.ExtraModifiers$KotlinOnlyModifiers
+-dontwarn org.jetbrains.dokka.model.JavaModifier$Final
+-dontwarn org.jetbrains.dokka.model.JavaVisibility$Public
+-dontwarn org.jetbrains.dokka.model.KotlinModifier$Final
+-dontwarn org.jetbrains.dokka.model.KotlinVisibility$Public
+-dontwarn org.jetbrains.dokka.model.Modifier
+-dontwarn org.jetbrains.dokka.model.Visibility
+-dontwarn org.jetbrains.dokka.model.WithChildren
+-dontwarn org.jetbrains.dokka.pages.RendererSpecificResourcePage
+-dontwarn org.jetbrains.dokka.pages.RenderingStrategy$Copy
+-dontwarn org.jetbrains.dokka.pages.RenderingStrategy
+-dontwarn org.jetbrains.dokka.plugability.ConfigurableBlock
+-dontwarn org.jetbrains.dokka.plugability.DokkaContext
+-dontwarn org.jetbrains.dokka.plugability.DokkaPlugin$ExtensionProvider
+
+-dontwarn org.jetbrains.dokka.plugability.DokkaPlugin
+-dontwarn org.jetbrains.dokka.plugability.DokkaPluginKt
+-dontwarn org.jetbrains.dokka.plugability.ExtendingDSL
+-dontwarn org.jetbrains.dokka.plugability.Extension
+-dontwarn org.jetbrains.dokka.plugability.ExtensionPoint
+-dontwarn org.jetbrains.dokka.plugability.OrderDsl
+-dontwarn org.jetbrains.dokka.renderers.Renderer
+-dontwarn org.jetbrains.dokka.transformers.documentation.DocumentableMerger
+-dontwarn org.jetbrains.dokka.transformers.documentation.DocumentableToPageTranslator
+-dontwarn org.jetbrains.dokka.transformers.documentation.DocumentableTransformer
+-dontwarn org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer
+-dontwarn org.jetbrains.dokka.transformers.pages.PageTransformer
+-dontwarn org.jetbrains.dokka.utilities.DokkaLogger
+-dontwarn org.jetbrains.dokka.utilities.JsonKt
+-dontwarn org.jetbrains.dokka.utilities.TypeReference$Companion
+-dontwarn org.jetbrains.dokka.utilities.TypeReference
+-dontwarn org.python.core.Py
+-dontwarn org.python.core.PyDictionary
+-dontwarn org.python.core.PyFloat
+-dontwarn org.python.core.PyInteger
+-dontwarn org.python.core.PyLong
+-dontwarn org.python.core.PyNone
+-dontwarn org.python.core.PyObject
+-dontwarn org.python.core.PySequence
+-dontwarn org.python.core.PyStringMap
+-dontwarn org.python.core.PySystemState
+-dontwarn org.zeroturnaround.javarebel.ClassEventListener
+-dontwarn org.zeroturnaround.javarebel.Reloader
+-dontwarn org.zeroturnaround.javarebel.ReloaderFactory
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -17,7 +17,7 @@ default_platform :android
 
 platform :android do
 
-    versionNum = 84
+    versionNum = 85
 
 
     before_all do

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
 kotlin = "2.0.0"
-ksp = "2.0.0-1.0.21"
+ksp = "2.0.0-1.0.22"
 kotlinx-coroutines = "1.8.1"
 kotlinx-serialization = "1.6.3"
 kotlinx-dateTime = "0.6.0"
 
 
 composeUiTooling = "1.3.1"
-androidGradlePlugin = "8.4.1"
+androidGradlePlugin = "8.5.0"
 koin = "3.6.0-Beta4"
 koinCompose = "3.6.0-Beta4"
 koinComposeMultiplatform = "1.2.0-Beta4"
@@ -20,15 +20,15 @@ googleServices = "4.3.15"
 androidxActivity = "1.9.0"
 androidxComposeCompiler = "1.5.8"
 jbComposeCompiler = "1.5.4"
-androidxComposeBom = "2024.05.00"
+androidxComposeBom = "2024.06.00"
 androidxNavigationCompose = "2.7.7"
-uiToolingPreview = "1.6.2"
+uiToolingPreview = "1.6.8"
 wearCompose = "1.3.1"
-androidxLifecycle = "2.8.0"
+androidxLifecycle = "2.8.2"
 imageLoader = "1.7.8"
 osmdroidAndroid = "6.1.18"
 
-composeMultiplatform = "1.6.10"
+composeMultiplatform = "1.6.11"
 accompanist = "0.32.0"
 coilCompose = "2.6.0"
 horologist = "0.6.12"
@@ -50,10 +50,10 @@ targetWearSdk = "33"
 compileSdk = "34"
 coreKtx = "1.13.1"
 espressoCore = "3.5.1"
-appcompat = "1.6.1"
+appcompat = "1.7.0"
 material = "1.12.0"
 constraintlayout = "2.1.4"
-lifecycleLivedataKtx = "2.8.0"
+lifecycleLivedataKtx = "2.8.2"
 navigationFragmentKtx = "2.7.7"
 navigationUiKtx = "2.7.7"
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun May 28 21:12:18 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists