Skip to content

Commit e34ca0b

Browse files
joreillyjoreilly
authored
Merge pull request #52 from joreilly/favoourites_issue
fix favoruties issue + dependency updates
2 parents b43f686 + e49aac1 commit e34ca0b

File tree

6 files changed

+102
-12
lines changed

6 files changed

+102
-12
lines changed

‎SharedCode/src/commonMain/kotlin/com/surrus/galwaybus/common/GalwayBusRepository.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ open class GalwayBusRepository : KoinComponent {
4141
val favorites = appSettings.favorites
4242

4343
val favoriteBusStopList = busStops.combine(favorites) { busStops, favorites ->
44-
Logger.i { "getBusStopsFlow().combine, favorites = $favorites, busStops size = ${busStops.size}" }
45-
favorites.map { favorite -> busStops.firstOrNull { it.stop_id == favorite } }.filterNotNull()
44+
Logger.i { "favoriteBusStopList, favorites = $favorites, busStops size = ${busStops.size}" }
45+
favorites.map { favorite -> busStops.firstOrNull { it.stopRef == favorite } }.filterNotNull()
4646
}
4747

4848
suspend fun fetchAndStoreBusStops() {

‎android-app/build.gradle.kts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,8 @@ dependencies {
154154
implementation(project(":SharedCode"))
155155
}
156156

157+
java {
158+
toolchain {
159+
languageVersion = JavaLanguageVersion.of(17)
160+
}
161+
}

‎android-app/proguard-rules.pro‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,88 @@
7777
-dontwarn org.jetbrains.annotations.NotNull
7878

7979
-dontwarn org.slf4j.impl.StaticLoggerBinder
80+
81+
82+
83+
-dontwarn com.fasterxml.jackson.dataformat.xml.JacksonXmlModule
84+
-dontwarn com.fasterxml.jackson.dataformat.xml.XmlMapper
85+
-dontwarn com.sun.org.apache.xml.internal.utils.PrefixResolver
86+
-dontwarn java.beans.BeanInfo
87+
-dontwarn java.beans.IndexedPropertyDescriptor
88+
-dontwarn java.beans.IntrospectionException
89+
-dontwarn java.beans.Introspector
90+
-dontwarn java.beans.MethodDescriptor
91+
-dontwarn java.beans.PropertyDescriptor
92+
-dontwarn javax.swing.tree.TreeNode
93+
-dontwarn org.apache.xml.utils.PrefixResolver
94+
-dontwarn org.jaxen.FunctionContext
95+
-dontwarn org.jaxen.NamespaceContext
96+
-dontwarn org.jaxen.Navigator
97+
-dontwarn org.jaxen.VariableContext
98+
-dontwarn org.jaxen.XPathFunctionContext
99+
-dontwarn org.jaxen.dom.DocumentNavigator
100+
-dontwarn org.jetbrains.dokka.CoreExtensions
101+
-dontwarn org.jetbrains.dokka.DokkaConfiguration$DokkaSourceSet
102+
-dontwarn org.jetbrains.dokka.DokkaConfiguration$PluginConfiguration
103+
-dontwarn org.jetbrains.dokka.DokkaConfiguration$SerializationFormat
104+
-dontwarn org.jetbrains.dokka.DokkaConfiguration
105+
-dontwarn org.jetbrains.dokka.DokkaSourceSetID
106+
-dontwarn org.jetbrains.dokka.Platform
107+
-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.DocumentableSourceLanguageParser
108+
-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.InternalKotlinAnalysisPlugin
109+
-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.ModuleAndPackageDocumentationReader
110+
-dontwarn org.jetbrains.dokka.analysis.kotlin.internal.SampleProviderFactory
111+
-dontwarn org.jetbrains.dokka.generation.Generation
112+
-dontwarn org.jetbrains.dokka.links.Callable
113+
-dontwarn org.jetbrains.dokka.links.DRI
114+
-dontwarn org.jetbrains.dokka.links.DriTarget
115+
-dontwarn org.jetbrains.dokka.model.Annotations$Annotation
116+
-dontwarn org.jetbrains.dokka.model.Annotations$AnnotationScope
117+
-dontwarn org.jetbrains.dokka.model.DisplaySourceSet
118+
-dontwarn org.jetbrains.dokka.model.DisplaySourceSetKt
119+
-dontwarn org.jetbrains.dokka.model.ExtraModifiers$KotlinOnlyModifiers$External
120+
-dontwarn org.jetbrains.dokka.model.ExtraModifiers$KotlinOnlyModifiers$TailRec
121+
-dontwarn org.jetbrains.dokka.model.ExtraModifiers$KotlinOnlyModifiers
122+
-dontwarn org.jetbrains.dokka.model.JavaModifier$Final
123+
-dontwarn org.jetbrains.dokka.model.JavaVisibility$Public
124+
-dontwarn org.jetbrains.dokka.model.KotlinModifier$Final
125+
-dontwarn org.jetbrains.dokka.model.KotlinVisibility$Public
126+
-dontwarn org.jetbrains.dokka.model.Modifier
127+
-dontwarn org.jetbrains.dokka.model.Visibility
128+
-dontwarn org.jetbrains.dokka.model.WithChildren
129+
-dontwarn org.jetbrains.dokka.pages.RendererSpecificResourcePage
130+
-dontwarn org.jetbrains.dokka.pages.RenderingStrategy$Copy
131+
-dontwarn org.jetbrains.dokka.pages.RenderingStrategy
132+
-dontwarn org.jetbrains.dokka.plugability.ConfigurableBlock
133+
-dontwarn org.jetbrains.dokka.plugability.DokkaContext
134+
-dontwarn org.jetbrains.dokka.plugability.DokkaPlugin$ExtensionProvider
135+
136+
-dontwarn org.jetbrains.dokka.plugability.DokkaPlugin
137+
-dontwarn org.jetbrains.dokka.plugability.DokkaPluginKt
138+
-dontwarn org.jetbrains.dokka.plugability.ExtendingDSL
139+
-dontwarn org.jetbrains.dokka.plugability.Extension
140+
-dontwarn org.jetbrains.dokka.plugability.ExtensionPoint
141+
-dontwarn org.jetbrains.dokka.plugability.OrderDsl
142+
-dontwarn org.jetbrains.dokka.renderers.Renderer
143+
-dontwarn org.jetbrains.dokka.transformers.documentation.DocumentableMerger
144+
-dontwarn org.jetbrains.dokka.transformers.documentation.DocumentableToPageTranslator
145+
-dontwarn org.jetbrains.dokka.transformers.documentation.DocumentableTransformer
146+
-dontwarn org.jetbrains.dokka.transformers.documentation.PreMergeDocumentableTransformer
147+
-dontwarn org.jetbrains.dokka.transformers.pages.PageTransformer
148+
-dontwarn org.jetbrains.dokka.utilities.DokkaLogger
149+
-dontwarn org.jetbrains.dokka.utilities.JsonKt
150+
-dontwarn org.jetbrains.dokka.utilities.TypeReference$Companion
151+
-dontwarn org.jetbrains.dokka.utilities.TypeReference
152+
-dontwarn org.python.core.Py
153+
-dontwarn org.python.core.PyDictionary
154+
-dontwarn org.python.core.PyFloat
155+
-dontwarn org.python.core.PyInteger
156+
-dontwarn org.python.core.PyLong
157+
-dontwarn org.python.core.PyNone
158+
-dontwarn org.python.core.PyObject
159+
-dontwarn org.python.core.PySequence
160+
-dontwarn org.python.core.PyStringMap
161+
-dontwarn org.python.core.PySystemState
162+
-dontwarn org.zeroturnaround.javarebel.ClassEventListener
163+
-dontwarn org.zeroturnaround.javarebel.Reloader
164+
-dontwarn org.zeroturnaround.javarebel.ReloaderFactory

‎fastlane/Fastfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ default_platform :android
1717

1818
platform :android do
1919

20-
versionNum = 84
20+
versionNum = 85
2121

2222

2323
before_all do

‎gradle/libs.versions.toml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[versions]
22
kotlin = "2.0.0"
3-
ksp = "2.0.0-1.0.21"
3+
ksp = "2.0.0-1.0.22"
44
kotlinx-coroutines = "1.8.1"
55
kotlinx-serialization = "1.6.3"
66
kotlinx-dateTime = "0.6.0"
77

88

99
composeUiTooling = "1.3.1"
10-
androidGradlePlugin = "8.4.1"
10+
androidGradlePlugin = "8.5.0"
1111
koin = "3.6.0-Beta4"
1212
koinCompose = "3.6.0-Beta4"
1313
koinComposeMultiplatform = "1.2.0-Beta4"
@@ -20,15 +20,15 @@ googleServices = "4.3.15"
2020
androidxActivity = "1.9.0"
2121
androidxComposeCompiler = "1.5.8"
2222
jbComposeCompiler = "1.5.4"
23-
androidxComposeBom = "2024.05.00"
23+
androidxComposeBom = "2024.06.00"
2424
androidxNavigationCompose = "2.7.7"
25-
uiToolingPreview = "1.6.2"
25+
uiToolingPreview = "1.6.8"
2626
wearCompose = "1.3.1"
27-
androidxLifecycle = "2.8.0"
27+
androidxLifecycle = "2.8.2"
2828
imageLoader = "1.7.8"
2929
osmdroidAndroid = "6.1.18"
3030

31-
composeMultiplatform = "1.6.10"
31+
composeMultiplatform = "1.6.11"
3232
accompanist = "0.32.0"
3333
coilCompose = "2.6.0"
3434
horologist = "0.6.12"
@@ -50,10 +50,10 @@ targetWearSdk = "33"
5050
compileSdk = "34"
5151
coreKtx = "1.13.1"
5252
espressoCore = "3.5.1"
53-
appcompat = "1.6.1"
53+
appcompat = "1.7.0"
5454
material = "1.12.0"
5555
constraintlayout = "2.1.4"
56-
lifecycleLivedataKtx = "2.8.0"
56+
lifecycleLivedataKtx = "2.8.2"
5757
navigationFragmentKtx = "2.7.7"
5858
navigationUiKtx = "2.7.7"
5959

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Sun May 28 21:12:18 IST 2023
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)