Skip to content

Commit 065f224

Browse files
authored
Merge pull request #38 from joreilly/dependency_updates
dependency updates
2 parents a1bbb3c + 5e86851 commit 065f224

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

android-app/build.gradle.kts

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,7 @@ android {
9999
targetCompatibility = JavaVersion.VERSION_1_8
100100
}
101101

102-
kotlinOptions {
103-
jvmTarget = "1.8"
104-
freeCompilerArgs += listOf(
105-
"-P",
106-
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
107-
)
108-
}
109-
110-
packagingOptions {
102+
packaging {
111103
resources {
112104
excludes += setOf("META-INF/*.kotlin_module")
113105
}
@@ -128,11 +120,11 @@ tasks.withType<KotlinCompile> {
128120
}
129121

130122
dependencies {
131-
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
123+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
132124

133125
implementation(platform("com.google.firebase:firebase-bom:26.2.0"))
134126
implementation("com.google.firebase:firebase-analytics-ktx")
135-
implementation("androidx.activity:activity-compose:1.6.0")
127+
implementation("androidx.activity:activity-compose:1.7.1")
136128

137129

138130
with(Deps.Koin) {
@@ -157,7 +149,7 @@ dependencies {
157149
implementation(material3WindowSizeClass)
158150
}
159151
implementation("io.github.pushpalroy:jetlime:1.0.3")
160-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
152+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1")
161153
implementation("com.google.maps.android:android-maps-utils:2.3.0")
162154

163155
with(Deps.PlayServices) {
@@ -166,8 +158,8 @@ dependencies {
166158
}
167159

168160
testImplementation("junit:junit:4.13.2")
169-
androidTestImplementation("androidx.test.ext:junit:1.1.3")
170-
androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
161+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
162+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
171163

172164
implementation(project(":SharedCode"))
173165
}

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 = 83
20+
versionNum = 84
2121

2222

2323
before_all do

0 commit comments

Comments
 (0)