Skip to content

Commit 618ef88

Browse files
fmasafmasa
authored
Merge pull request #90 from fmasa/dep-bump
Jetpack Compose 1.3 + dependency cleanup
2 parents 49b797b + 9ef45d9 commit 618ef88

File tree

10 files changed

+43
-118
lines changed

10 files changed

+43
-118
lines changed

‎app/build.gradle.kts‎

Lines changed: 9 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,8 @@ android {
8080
jvmTarget = "1.8"
8181
freeCompilerArgs = freeCompilerArgs +
8282
"-Xskip-prerelease-check" +
83-
"-Xopt-in=androidx.compose.foundation.layout.ExperimentalLayout" +
84-
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi" +
8583
"-Xopt-in=androidx.compose.material.ExperimentalMaterialApi" +
8684
"-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi" +
87-
"-Xopt-in=androidx.compose.animation.ExperimentalFoundationApi" +
88-
"-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi" +
89-
"-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi" +
90-
"-Xopt-in=com.google.accompanist.permissions.ExperimentalPermissionsApi" +
9185
"-P" +
9286
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
9387
}
@@ -97,61 +91,20 @@ dependencies {
9791
implementation(project(":common"))
9892
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
9993
// Allow use of Java 8 APIs on older Android versions
100-
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
101-
102-
// Permission management
103-
implementation("com.google.accompanist:accompanist-permissions:0.20.0")
104-
105-
// QR code scanning
106-
implementation("com.google.zxing:core:3.3.3")
107-
implementation("androidx.camera:camera-camera2:1.1.0-alpha02")
108-
implementation("androidx.camera:camera-core:1.1.0-alpha02")
109-
implementation("androidx.camera:camera-lifecycle:1.1.0-alpha02")
110-
implementation("androidx.camera:camera-view:1.0.0-alpha22")
94+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
11195

11296
// Testing utilities
113-
testImplementation("junit:junit:4.13.1")
114-
androidTestImplementation("androidx.test.ext:junit:1.1.2")
115-
androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0")
97+
testImplementation("junit:junit:4.13.2")
98+
androidTestImplementation("androidx.test.ext:junit:1.1.5")
99+
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
116100
testImplementation("org.mockito:mockito-core:2.7.22")
117101

118102
// Basic Android stuff
119-
api("androidx.core:core-ktx:1.5.0")
120-
api("androidx.fragment:fragment-ktx:1.3.5")
121-
122-
// Jetpack Compose
123-
api("androidx.compose.material:material:${Versions.compose}")
124-
api("androidx.compose.ui:ui-tooling:${Versions.compose}")
125-
api("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
126-
127-
// Firebase-related dependencies
128-
api(platform("com.google.firebase:firebase-bom:28.4.2"))
129-
api("com.google.firebase:firebase-firestore-ktx")
130-
api("com.google.firebase:firebase-analytics-ktx")
131-
api("com.google.firebase:firebase-auth-ktx")
132-
api("com.google.firebase:firebase-dynamic-links-ktx")
133-
api("com.google.firebase:firebase-functions-ktx")
134-
api("androidx.work:work-runtime-ktx:2.7.0")
103+
api("androidx.core:core-ktx:1.9.0")
104+
api("androidx.fragment:fragment-ktx:1.5.6")
135105

136106
// Coroutines
137-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
138-
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
139-
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.5")
140-
141-
api("io.arrow-kt:arrow-core:0.10.4")
142-
143-
// Parser combinator library (grammars etc.)
144-
api("com.github.h0tk3y.betterParse:better-parse:0.4.2")
145-
146-
// JSON encoding
147-
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0")
148-
149-
// HTTP Client
150-
val ktorVersion = "1.6.0"
151-
implementation("io.ktor:ktor-client-core:$ktorVersion")
152-
implementation("io.ktor:ktor-client-cio:$ktorVersion")
153-
implementation("io.ktor:ktor-client-serialization:$ktorVersion")
154-
155-
// Firebase Performance
156-
// implementation("com.google.firebase:firebase-perf-ktx:20.0.1")
107+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
108+
api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
109+
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
157110
}

‎app/src/main/kotlin/cz/muni/fi/rpg/ui/WfrpMasterApp.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import cz.frantisekmasa.wfrp_master.common.shell.DrawerShell
2020
import cz.frantisekmasa.wfrp_master.common.shell.NetworkStatusBanner
2121
import cz.muni.fi.rpg.ui.shell.ProvideDIContainer
2222
import cz.muni.fi.rpg.ui.shell.Startup
23-
import io.ktor.http.Url
2423
import kotlinx.coroutines.launch
2524

2625
@ExperimentalMaterialApi
@@ -64,7 +63,7 @@ private fun rememberInitialScreens(url: Uri?): List<Screen> {
6463
listOf(PartyListScreen) +
6564
when (url) {
6665
null -> emptyList()
67-
else -> listOf(InvitationLinkScreen(Url(url.toString())))
66+
else -> listOf(InvitationLinkScreen(url.toString()))
6867
}
6968
}
7069
}

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ buildscript {
99

1010
dependencies {
1111
classpath("com.android.tools.build:gradle:${Versions.agp}")
12-
classpath("org.jetbrains.compose:compose-gradle-plugin:1.2.2")
12+
classpath("org.jetbrains.compose:compose-gradle-plugin:${Versions.compose}")
1313

1414
classpath(kotlin("gradle-plugin", Versions.kotlin))
1515
classpath(kotlin("serialization", Versions.kotlin))

‎buildSrc/src/main/resources/versions.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
androidGradlePluginVersion=7.3.1
22
kotlinVersion=1.7.20
3-
composeVersion=1.2.1
3+
composeVersion=1.3.1
44

55
# Android SDK
66
androidMinSdk=21

‎common/build.gradle.kts‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ kotlin {
1919
}
2020

2121
sourceSets {
22-
val koinVersion = "3.1.2"
23-
2422
all {
2523
languageSettings.apply {
2624
optIn("androidx.compose.material.ExperimentalMaterialApi")
@@ -44,7 +42,6 @@ kotlin {
4442

4543
val voyagerVersion = "1.0.0-rc04"
4644
api("cafe.adriel.voyager:voyager-navigator:$voyagerVersion")
47-
api("cafe.adriel.voyager:voyager-koin:$voyagerVersion")
4845
api("cafe.adriel.voyager:voyager-transitions:$voyagerVersion")
4946

5047
api(project(":common:firebase"))
@@ -58,8 +55,6 @@ kotlin {
5855
api("org.kodein.di:kodein-di-framework-compose:$kodeinVersion")
5956
implementation("org.kodein.di:kodein-di:$kodeinVersion")
6057

61-
api("io.insert-koin:koin-core:$koinVersion")
62-
6358
implementation("io.arrow-kt:arrow-core:1.0.1")
6459

6560
// Parser combinator library (grammars etc.)
@@ -69,7 +64,7 @@ kotlin {
6964
implementation("com.benasher44:uuid:0.3.1")
7065

7166
// JSON encoding
72-
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0")
67+
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
7368

7469
// Logging
7570
api("io.github.aakira:napier:${Versions.napier}")
@@ -96,36 +91,31 @@ kotlin {
9691

9792
val androidMain by getting {
9893
dependencies {
99-
100-
// Dependency injection
101-
api("io.insert-koin:koin-android:$koinVersion")
102-
10394
// Permission management
10495
implementation("com.google.accompanist:accompanist-permissions:0.20.0")
10596

106-
api("androidx.activity:activity-compose:1.5.0-alpha03")
97+
api("androidx.activity:activity-compose:1.7.0")
10798

108-
api("androidx.appcompat:appcompat:1.3.1")
109-
api("androidx.core:core-ktx:1.3.1")
99+
api("androidx.appcompat:appcompat:1.6.1")
100+
api("androidx.core:core-ktx:1.9.0")
110101

111-
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.3.5")
102+
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
112103

113104
implementation("org.kodein.di:kodein-di-framework-android-core:$kodeinVersion")
114-
api("io.insert-koin:koin-android:$koinVersion")
115105

116-
api("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
117-
api("androidx.lifecycle:lifecycle-runtime-ktx:2.4.0")
106+
api("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
107+
api("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
118108

119109
// Authentication
120-
api("com.google.android.gms:play-services-auth:19.0.0")
121-
implementation("com.google.firebase:firebase-auth-ktx:21.0.1")
122-
implementation("com.google.firebase:firebase-dynamic-links-ktx:21.0.1")
110+
api("com.google.android.gms:play-services-auth:20.4.1")
111+
implementation("com.google.firebase:firebase-auth-ktx:21.2.0")
112+
implementation("com.google.firebase:firebase-dynamic-links-ktx:21.1.0")
123113

124114
// Shared Preferences DataStore
125115
api("androidx.datastore:datastore-preferences:1.0.0")
126116

127117
// Firebase functions
128-
api("com.google.firebase:firebase-functions-ktx:20.0.1")
118+
api("com.google.firebase:firebase-functions-ktx:20.2.2")
129119

130120
implementation("com.tom-roush:pdfbox-android:2.0.27.0")
131121

@@ -138,14 +128,14 @@ kotlin {
138128
// QR codes
139129
implementation("com.google.zxing:core:3.3.3")
140130

141-
implementation("androidx.camera:camera-camera2:1.1.0-alpha02")
142-
implementation("androidx.camera:camera-core:1.1.0-alpha02")
143-
implementation("androidx.camera:camera-lifecycle:1.1.0-alpha02")
144-
implementation("androidx.camera:camera-view:1.0.0-alpha22")
131+
implementation("androidx.camera:camera-camera2:1.2.2")
132+
implementation("androidx.camera:camera-core:1.2.2")
133+
implementation("androidx.camera:camera-lifecycle:1.2.2")
134+
implementation("androidx.camera:camera-view:1.2.2")
145135

146136
// Network availability check
147137
implementation("com.github.pwittchen:reactivenetwork-rx2:3.0.8")
148-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.4.2")
138+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.6.4")
149139
}
150140
}
151141

@@ -202,7 +192,7 @@ android {
202192

203193
dependencies {
204194
// Allow use of Java 8 APIs on older Android versions
205-
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.5")
195+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.2.2")
206196
}
207197

208198
compileOptions {
@@ -221,5 +211,5 @@ android {
221211
}
222212
}
223213
dependencies {
224-
implementation("com.google.firebase:firebase-crashlytics-ktx:18.2.4")
214+
implementation("com.google.firebase:firebase-crashlytics-ktx:18.3.6")
225215
}

‎common/firebase/build.gradle.kts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ kotlin {
1515
named("commonMain") {
1616
dependencies {
1717
implementation("io.github.aakira:napier:${Versions.napier}")
18-
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.0")
19-
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.0")
18+
api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
19+
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2")
2020
}
2121
}
2222
named("jvmMain") {
2323
dependencies {
2424
api("com.google.cloud:google-cloud-firestore:3.0.18")
25-
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.0")
25+
api("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.6.4")
2626
}
2727
}
2828
named("androidMain") {
2929
dependencies {
30-
api("com.google.firebase:firebase-auth-ktx:21.0.3")
31-
api("com.google.firebase:firebase-crashlytics-ktx:18.2.9")
32-
api("com.google.firebase:firebase-firestore-ktx:24.1.0")
33-
api("com.google.firebase:firebase-analytics-ktx:20.1.2")
34-
api("com.google.firebase:firebase-functions-ktx:20.0.2")
35-
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.0")
30+
api("com.google.firebase:firebase-auth-ktx:21.2.0")
31+
api("com.google.firebase:firebase-crashlytics-ktx:18.3.6")
32+
api("com.google.firebase:firebase-firestore-ktx:24.4.5")
33+
api("com.google.firebase:firebase-analytics-ktx:21.2.1")
34+
api("com.google.firebase:firebase-functions-ktx:20.2.2")
35+
api("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4")
3636
}
3737
}
3838
}

‎common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/logging/KoinNapierLogger.kt‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/invitation/InvitationLinkScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import io.ktor.http.URLBuilder
2525
import io.ktor.http.Url
2626

2727
class InvitationLinkScreen(
28-
private val url: Url,
28+
private val url: String,
2929
) : Screen {
3030

3131
@Composable
@@ -58,7 +58,7 @@ class InvitationLinkScreen(
5858
val snackbarHolder = LocalPersistentSnackbarHolder.current
5959

6060
LaunchedEffect(url) {
61-
val loadedInvitation = url.parameters[QUERY_PARAMETER]?.let {
61+
val loadedInvitation = Url(url).parameters[QUERY_PARAMETER]?.let {
6262
screenModel.deserializeInvitation(it)
6363
}
6464

‎desktop/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ kotlin {
1818
implementation(compose.desktop.currentOs)
1919
implementation(project(":common:firebase"))
2020
implementation(project(":common"))
21-
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.0")
21+
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.6.4")
2222
implementation("org.slf4j:slf4j-simple:1.7.36")
2323
}
2424
}

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# http://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
9-
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
9+
org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
1010
org.gradle.parallel=true
1111

1212
kapt.incremental.apt=true

0 commit comments

Comments
 (0)