Skip to content

Commit 8628ea0

Browse files
Lib updates (#386)
1 parent 3c889dd commit 8628ea0

File tree

7 files changed

+39
-34
lines changed

7 files changed

+39
-34
lines changed

android/app-newm/build.gradle.kts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ plugins {
1111
id("kotlin-parcelize")
1212
kotlin("android")
1313
kotlin("kapt")
14-
id("io.sentry.android.gradle") version "5.8.0"
14+
id("io.sentry.android.gradle") version "5.12.1"
1515
alias(libs.plugins.compose.multiplatform)
1616
}
1717

@@ -89,10 +89,6 @@ android {
8989
targetCompatibility = JavaVersion.VERSION_11
9090
}
9191

92-
kotlinOptions {
93-
jvmTarget = "11"
94-
}
95-
9692
kapt {
9793
correctErrorTypes = true
9894
}
@@ -138,6 +134,11 @@ dependencies {
138134
androidTestImplementation(libs.mockk.android)
139135
}
140136

137+
kotlin {
138+
compilerOptions {
139+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
140+
}
141+
}
141142

142143
sentry {
143144
org.set("project-newm")

android/app-newm/src/main/java/io/newm/screens/profile/edit/ProfileEditUi.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,11 @@ private fun ProfileEditUiContent(
166166
},
167167
selectedImageCallback = {
168168
onEvent(OnReplaceProfilePicture(it))
169-
})
169+
},
170+
selectedImageFileCallback = {
171+
onEvent(OnRemoveProfilePicture)
172+
},
173+
)
170174
}
171175

172176
@Composable

android/core/test-utils/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ android {
2020
sourceCompatibility = JavaVersion.VERSION_11
2121
targetCompatibility = JavaVersion.VERSION_11
2222
}
23-
24-
kotlinOptions {
25-
jvmTarget = "11"
26-
}
2723
}
2824

2925
dependencies {

android/features/barcode-scanner/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ android {
1919
sourceCompatibility = JavaVersion.VERSION_11
2020
targetCompatibility = JavaVersion.VERSION_11
2121
}
22-
23-
kotlinOptions {
24-
jvmTarget = "11"
25-
}
2622
}
2723

2824
dependencies {
@@ -40,4 +36,10 @@ dependencies {
4036
implementation(project(Modules.coreTheme))
4137
implementation(project(Modules.coreUiUtils))
4238
implementation(project(Modules.shared))
39+
}
40+
41+
kotlin {
42+
compilerOptions {
43+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
44+
}
4345
}

android/features/music-player/build.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ android {
1919
sourceCompatibility = JavaVersion.VERSION_11
2020
targetCompatibility = JavaVersion.VERSION_11
2121
}
22-
23-
kotlinOptions {
24-
jvmTarget = "11"
25-
}
2622
}
2723

2824
dependencies {
@@ -45,3 +41,9 @@ dependencies {
4541

4642
testImplementation(project(Modules.testUtils))
4743
}
44+
45+
kotlin {
46+
compilerOptions {
47+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
48+
}
49+
}

gradle/libs.versions.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@ agp = "8.13.0"
33
android-compileSdk = "36"
44
android-minSdk = "28"
55
android-targetSdk = "36"
6-
androidx-activityCompose = "1.10.1"
7-
androidx-appcompat = "1.7.0"
6+
androidx-activityCompose = "1.11.0"
7+
androidx-appcompat = "1.7.1"
88
androidx-constraintlayout = "2.2.1"
9-
androidx-core-ktx = "1.16.0"
9+
androidx-core-ktx = "1.17.0"
1010
androidx-espresso-core = "3.6.1"
1111
androidx-material = "1.12.0"
1212
androidx-test-junit = "1.2.1"
1313
barcodeScanning = "17.3.0"
14-
browser = "1.8.0"
15-
cameraView = "1.4.2"
14+
browser = "1.9.0"
15+
cameraView = "1.5.1"
1616
circuitFoundation = "0.28.0"
17-
cloudinaryAndroid = "3.0.2"
18-
cmpImagePickNCrop = "1.0.9"
19-
coil = "3.2.0"
20-
compose-multiplatform = "1.8.1"
17+
cloudinaryAndroid = "3.1.2"
18+
cmpImagePickNCrop = "1.1.2"
19+
coil = "3.3.0"
20+
compose-multiplatform = "1.9.2"
2121
coreSplashscreen = "1.0.1"
2222
coroutinesExtensions = "1.5.5"
23-
datastorePreferences = "1.1.2"
23+
datastorePreferences = "1.1.7"
2424
firebaseBom = "33.14.0"
2525
flipper = "0.273.0"
2626
flipperNoop = "0.273.0"
@@ -37,23 +37,23 @@ kotlinxCoroutines = "1.10.2"
3737
ksp = "2.2.10-2.0.2"
3838
ktor = "3.1.3"
3939
kvault = "1.12.0"
40-
launchdarklyAndroidClientSdk = "5.8.0"
41-
lifecycleRuntimeKtx = "2.9.0"
40+
launchdarklyAndroidClientSdk = "5.9.2"
41+
lifecycleRuntimeKtx = "2.9.4"
4242
material = "1.8.0"
4343
materialIconsExtended = "1.7.8"
4444
media3 = "1.7.1"
4545
mockk = "1.14.2"
46-
navigationCompose = "2.9.0"
46+
navigationCompose = "2.9.5"
4747
paletteKtx = "1.0.0"
4848
paparazzi = "1.3.5"
4949
playServicesAuth = "21.3.0"
5050
processPhoenix = "3.0.0"
5151
recaptcha = "18.7.1"
5252
runtime = "2.1.0"
5353
soloader = "0.12.1"
54-
store5 = "5.1.0-alpha04"
54+
store5 = "5.1.0-alpha07"
5555
testParameterInjector = "1.18"
56-
uiUtil = "1.8.2"
56+
uiUtil = "1.9.4"
5757
jetbrainsKotlinJvm = "1.9.24"
5858
runner = "1.5.2"
5959
core = "1.5.0"

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)