Skip to content

Commit c6eb392

Browse files
authored
Upgrade to Android 35 (#3774)
* upgrade to robolectric 4.14-beta-1 * bump the Android SDK to 35
1 parent 8598a13 commit c6eb392

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

build-logic/src/main/kotlin/AndroidConfiguration.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ internal fun Project.excludeAndroidSdkDependencies() {
5757
}
5858

5959
private fun BaseExtension.configureSdk() {
60-
compileSdkVersion(34)
60+
compileSdkVersion(35)
6161

6262
defaultConfig {
6363
minSdk = 21
64-
targetSdk = 34
64+
targetSdk = 35
6565
}
6666
}
6767

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ play-review = "com.google.android.play:review-ktx:2.0.1"
198198
play-tagmanager = "com.google.android.gms:play-services-tagmanager:18.1.1"
199199
retrofit2 = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit2" }
200200
retrofit2-converters-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit2" }
201-
robolectric = "org.robolectric:robolectric:4.13"
201+
robolectric = "org.robolectric:robolectric:4.14-beta-1"
202202
rtlViewpager = "com.github.duolingo:rtl-viewpager:2.0.0"
203203
scarlet = { module = "com.tinder.scarlet:scarlet", version.ref = "scarlet" }
204204
scarlet-adapters-stream-coroutines = { module = "com.tinder.scarlet:stream-adapter-coroutines", version.ref = "scarlet" }

ui/base-tool/src/main/kotlin/org/cru/godtools/base/tool/BaseToolRendererModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ abstract class BaseToolRendererModule {
4343
@Provides
4444
@Reusable
4545
fun parserConfig(@ApplicationContext context: Context) = ParserConfig()
46-
.withAppVersion(DeviceType.ANDROID, context.versionName.substringBefore("-"))
46+
.withAppVersion(DeviceType.ANDROID, context.versionName?.substringBefore("-"))
4747
.withSupportedFeatures(setOf(FEATURE_ANIMATION, FEATURE_CONTENT_CARD, FEATURE_FLOW, FEATURE_MULTISELECT))
4848

4949
@Provides

0 commit comments

Comments
 (0)