Skip to content

Commit 24bbb77

Browse files
Merge pull request #5706 from simpledotorg/master
2 parents fc8ab4f + ff3c9e5 commit 24bbb77

12 files changed

Lines changed: 22 additions & 61 deletions

File tree

CHANGELOG.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### Internal
66

7-
- Bump Sentry to v8.29.0
7+
- Bump Sentry to v8.30.0
88
- Bump AndroidX Lifecycle to v2.10.0
99
- Bump AndroidX Test Runner to v1.7.0
1010
- Bump AndroidX Test Rules to v1.7.0
@@ -25,16 +25,16 @@
2525
- Bump AndroidX Camera View to v1.5.2
2626
- Bump dagger to v2.57.2
2727
- Bump UUID generator to v5.2.0
28-
- Bump Compose BOM to v2025.12.01
28+
- Bump Compose BOM to v2026.01.00
2929
- Bump Sentry Android to v5.12.2
3030
- Update GH Actions `checkout` to v6
3131
- Update GH Actions `setup-jdk` to to v5
3232
- Bump Gradle to v9.2.1
33-
- Bump Mockito Kotlin to v6.1.0
33+
- Bump Mockito Kotlin to v6.2.0
3434
- Add helper function `diagnosedAt` to update the htn and dm diagnosed at fields in medical history
3535
- Bump asm to v9.9.1
36-
- Bump AGP to v8.13.2
37-
- Bump Lint to v31.13.2
36+
- Bump AGP to v9.0.0
37+
- Bump Lint to v32.0.0
3838
- Disable Ksp1 and enable Ksp2 by default
3939
- Update GH Workflow Actions `Setup Gradle` to v5
4040
- Bump Google Service to v4.4.4
@@ -47,6 +47,7 @@
4747
- Add support for Android 16
4848
- Bump compile and target SDK to 36
4949
- Bump AndroidX Activity to v1.12.2
50+
- Bump Chucker to v4.3.0
5051

5152
### Changes
5253

app/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import java.util.EnumSet
88

99
plugins {
1010
alias(libs.plugins.android.application)
11-
alias(libs.plugins.kotlin.android)
1211
alias(libs.plugins.kotlin.parcelize)
1312
alias(libs.plugins.sentry)
1413
alias(libs.plugins.ksp)

app/src/test/java/org/simple/clinic/mobius/CustomFirstMatchers.kt

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

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
alias(libs.plugins.android.library) apply false
44
alias(libs.plugins.android.lint) apply false
55
alias(libs.plugins.androidx.benchmark) apply false
6-
alias(libs.plugins.kotlin.android) apply false
76
alias(libs.plugins.kotlin.jvm) apply false
87
alias(libs.plugins.kotlin.parcelize) apply false
98
alias(libs.plugins.kotlin.compose.compiler) apply false

common-ui/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.library)
3-
alias(libs.plugins.kotlin.android)
43
alias(libs.plugins.kotlin.compose.compiler)
54
}
65

gradle.properties

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,13 @@ disableScreenshot=false
4747
allowRootedDevice=true
4848
maestroTests=false
4949
org.gradle.unsafe.configuration-cache=true
50+
51+
# AGP 9 compatibility flags (temporary)
52+
# Remove gradually before AGP 10
53+
android.uniquePackageNames=false
54+
android.enableAppCompileTimeRClass=false
55+
android.r8.optimizedResourceShrinking=false
56+
# remove this when sentry-android-gradle-plugin releases version 6.x.x
57+
# https://github.com/getsentry/sentry-android-gradle-plugin/issues/1004
58+
android.newDsl=false
59+

gradle/libs.versions.toml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
agp = "8.13.2"
2+
agp = "9.0.0"
33

44
androidx-cameraView = "1.5.2"
55
androidx-camera = "1.5.2"
@@ -11,7 +11,7 @@ androidx-viewmodel = "2.10.0"
1111
androidx-lifecycle = "2.10.0"
1212
androidx-activity = "1.12.2"
1313

14-
chucker = "4.2.0"
14+
chucker = "4.3.0"
1515
dagger = "2.57.2"
1616

1717
kotlin = "2.3.0"
@@ -20,7 +20,7 @@ ksp = "2.3.4"
2020

2121
ktlint = "0.36.0"
2222

23-
lint = "31.13.2"
23+
lint = "32.0.0"
2424

2525
mobius = "2.1.1"
2626

@@ -38,7 +38,7 @@ coroutines = "1.10.2"
3838

3939
compose-compiler = "1.5.13"
4040

41-
androidx-compose-bom = "2025.12.01"
41+
androidx-compose-bom = "2026.01.00"
4242

4343
composeThemeAdapter = "0.36.0"
4444

@@ -142,7 +142,7 @@ lottie = "com.airbnb.android:lottie-compose:6.7.1"
142142

143143
material = "com.google.android.material:material:1.13.0"
144144

145-
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:6.1.0"
145+
mockito-kotlin = "org.mockito.kotlin:mockito-kotlin:6.2.0"
146146

147147
mobius-android = { module = "com.spotify.mobius:mobius-android", version.ref = "mobius" }
148148
mobius-core = { module = "com.spotify.mobius:mobius-core", version.ref = "mobius" }
@@ -179,7 +179,7 @@ rx-java = "io.reactivex.rxjava2:rxjava:2.2.21"
179179
rx-kotlin = "io.reactivex.rxjava2:rxkotlin:2.4.0"
180180
rx-preferences = "com.f2prateek.rx.preferences2:rx-preferences:2.0.1"
181181

182-
sentry-android = "io.sentry:sentry-android:8.29.0"
182+
sentry-android = "io.sentry:sentry-android:8.30.0"
183183

184184
signaturepad = "com.github.gcacace:signature-pad:1.3.1"
185185

@@ -224,7 +224,6 @@ android-application = { id = "com.android.application", version.ref = "agp" }
224224
android-library = { id = "com.android.library", version.ref = "agp" }
225225
android-lint = { id = "com.android.lint", version.ref = "agp" }
226226
androidx-benchmark = { id = "androidx.benchmark", version = "1.4.1" }
227-
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
228227
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
229228
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
230229
kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

mobius-base/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.androidx.benchmark)
4-
alias(libs.plugins.kotlin.android)
54
}
65

76
android {

simple-platform/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.library)
3-
alias(libs.plugins.kotlin.android)
43
}
54

65
android {

simple-platform/consumer-rules.pro

Whitespace-only changes.

0 commit comments

Comments
 (0)