Skip to content

Commit 007e523

Browse files
brandonpagebrandonpage
authored
Merge pull request #2757 from brandonpage/dependency-bump-13.1
Bump all dependencies. Fix User Switcher screen.
2 parents 07fe0e4 + 54ff9bb commit 007e523

14 files changed

Lines changed: 69 additions & 66 deletions

File tree

‎.github/workflows/reusable-workflow.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: android-actions/setup-android@v3
4747
- uses: gradle/actions/setup-gradle@v4
4848
with:
49-
gradle-version: "8.7"
49+
gradle-version: "8.10.1"
5050
add-job-summary: on-failure
5151
add-job-summary-as-pr-comment: on-failure
5252
- name: Run Lint
@@ -79,8 +79,8 @@ jobs:
7979
if: success() || failure()
8080
env:
8181
# Most used according to https://gs.statcounter.com/android-version-market-share/mobile-tablet/worldwide
82-
PR_API_VERSION: "34"
83-
FULL_API_RANGE: "28 29 30 31 32 33 34 35"
82+
PR_API_VERSION: "35"
83+
FULL_API_RANGE: "28 29 30 31 32 33 34 35 36"
8484
IS_PR: ${{ inputs.is_pr }}
8585
run: |
8686
LEVELS_TO_TEST=$FULL_API_RANGE
@@ -114,8 +114,8 @@ jobs:
114114
if: success() || failure()
115115
env:
116116
# Most used according to https://gs.statcounter.com/android-version-market-share/mobile-tablet/worldwide
117-
PR_API_VERSION: "34"
118-
FULL_API_RANGE: "28 29 30 31 32 33 34 35"
117+
PR_API_VERSION: "35"
118+
FULL_API_RANGE: "28 29 30 31 32 33 34 35 36"
119119
IS_PR: ${{ inputs.is_pr }}
120120
run: |
121121
LEVELS_TO_TEST=$FULL_API_RANGE

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
classpath("com.android.tools.build:gradle:8.10.1")
1313
classpath("io.github.gradle-nexus:publish-plugin:2.0.0")
1414
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.24")
15-
classpath("org.jacoco:org.jacoco.core:0.8.12")
15+
classpath("org.jacoco:org.jacoco.core:0.8.13")
1616
}
1717
}
1818

‎hybrid/HybridSampleApps/AccountEditor/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ plugins {
55

66
dependencies {
77
api(project(":libs:SalesforceHybrid"))
8-
implementation("androidx.core:core-ktx:1.16.0")
8+
implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk
99
}
1010

1111
android {
1212
namespace = "com.salesforce.samples.accounteditor"
1313

14-
compileSdk = 35
14+
compileSdk = 36
1515

1616
defaultConfig {
17-
targetSdk = 35
17+
targetSdk = 36
1818
minSdk = 28
1919
}
2020

‎hybrid/HybridSampleApps/MobileSyncExplorerHybrid/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ plugins {
55

66
dependencies {
77
api(project(":libs:SalesforceHybrid"))
8-
implementation("androidx.core:core-ktx:1.16.0")
8+
implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk
99
}
1010

1111
android {
1212
namespace = "com.salesforce.samples.mobilesyncexplorerhybrid"
1313

14-
compileSdk = 35
14+
compileSdk = 36
1515

1616
defaultConfig {
17-
targetSdk = 35
17+
targetSdk = 36
1818
minSdk = 28
1919
}
2020

‎libs/MobileSync/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,17 @@ dependencies {
1313
api(project(":libs:SmartStore"))
1414
api("androidx.appcompat:appcompat:1.7.1")
1515
api("androidx.appcompat:appcompat-resources:1.7.1")
16-
implementation("androidx.core:core-ktx:1.16.0")
17-
androidTestImplementation("androidx.test:runner:1.6.2")
18-
androidTestImplementation("androidx.test:rules:1.6.1")
19-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
16+
implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk
17+
androidTestImplementation("androidx.test:runner:1.7.0")
18+
androidTestImplementation("androidx.test:rules:1.7.0")
19+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
2020
}
2121

2222
android {
2323
namespace = "com.salesforce.androidsdk.mobilesync"
2424
testNamespace = "com.salesforce.androidsdk.mobilesync.tests"
2525

26+
//noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0
2627
compileSdk = 35
2728

2829
defaultConfig {

‎libs/SalesforceAnalytics/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@ plugins {
1212
dependencies {
1313
api("com.squareup:tape:1.2.3")
1414
api("io.github.pilgr:paperdb:2.7.2")
15-
implementation("androidx.core:core-ktx:1.16.0")
16-
androidTestImplementation("androidx.test:runner:1.6.2")
17-
androidTestImplementation("androidx.test:rules:1.6.1")
18-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
15+
implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk
16+
androidTestImplementation("androidx.test:runner:1.7.0")
17+
androidTestImplementation("androidx.test:rules:1.7.0")
18+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
1919
}
2020

2121
android {
2222
namespace = "com.salesforce.androidsdk.analytics"
2323
testNamespace = "com.salesforce.androidsdk.analytics.tests"
2424

25+
//noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0
2526
compileSdk = 35
2627

2728
defaultConfig {

‎libs/SalesforceHybrid/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,17 @@ dependencies {
1818
api("androidx.appcompat:appcompat-resources:1.7.1")
1919
api("androidx.webkit:webkit:1.14.0")
2020
api("androidx.core:core-splashscreen:1.0.1")
21-
implementation("androidx.core:core-ktx:1.16.0")
22-
androidTestImplementation("androidx.test:runner:1.6.2")
23-
androidTestImplementation("androidx.test:rules:1.6.1")
24-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
21+
implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk
22+
androidTestImplementation("androidx.test:runner:1.7.0")
23+
androidTestImplementation("androidx.test:rules:1.7.0")
24+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
2525
}
2626

2727
android {
2828
namespace = "com.salesforce.androidsdk.hybrid"
2929
testNamespace = "com.salesforce.androidsdk.phonegap"
3030

31+
//noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0
3132
compileSdk = 35
3233

3334
defaultConfig {

‎libs/SalesforceReact/build.gradle.kts‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ plugins {
2323
dependencies {
2424
api(project(":libs:MobileSync"))
2525
api("com.facebook.react:react-android:0.79.3")
26-
implementation("androidx.core:core-ktx:1.16.0")
27-
androidTestImplementation("androidx.test:runner:1.6.2")
28-
androidTestImplementation("androidx.test:rules:1.6.1")
29-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
26+
implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk
27+
androidTestImplementation("androidx.test:runner:1.7.0")
28+
androidTestImplementation("androidx.test:rules:1.7.0")
29+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
3030
androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0")
3131

3232
// JSC from node_modules
@@ -42,6 +42,7 @@ android {
4242
namespace = "com.salesforce.androidsdk.reactnative"
4343
testNamespace = "com.salesforce.androidsdk.reactnative.tests"
4444

45+
//noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0
4546
compileSdk = 35
4647

4748
defaultConfig {

‎libs/SalesforceSDK/build.gradle.kts‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ plugins {
1111
}
1212

1313
dependencies {
14-
val composeVersion = "1.8.2"
14+
val composeVersion = "1.8.2" // Update requires Kotlin 2.
1515
val livecycleVersion = "2.8.7" // Update requires Kotlin 2.
1616
val androidXActivityVersion = "1.10.1"
1717

1818
api(project(":libs:SalesforceAnalytics"))
1919
api("com.squareup.okhttp3:okhttp:4.12.0")
20-
api("com.google.firebase:firebase-messaging:24.1.1")
21-
api("androidx.core:core:1.16.0")
22-
api("androidx.browser:browser:1.8.0")
23-
api("androidx.work:work-runtime-ktx:2.10.1")
20+
api("com.google.firebase:firebase-messaging:25.0.0")
21+
api("androidx.core:core:1.16.0") // Update requires API 36 compileSdk
22+
api("androidx.browser:browser:1.8.0") // Update requires API 36 compileSdk
23+
api("androidx.work:work-runtime-ktx:2.10.3")
2424

25-
implementation("com.google.android.material:material:1.12.0") // remove this when all xml is gone
25+
implementation("com.google.android.material:material:1.13.0") // remove this when all xml is gone
2626
implementation("androidx.appcompat:appcompat:1.7.1")
2727
implementation("androidx.biometric:biometric:1.2.0-alpha05")
2828
implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
29-
implementation("androidx.core:core-ktx:1.16.0")
29+
implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk
3030
implementation("androidx.activity:activity-ktx:$androidXActivityVersion")
3131
implementation("androidx.activity:activity-compose:$androidXActivityVersion")
3232
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$livecycleVersion")
@@ -37,7 +37,7 @@ dependencies {
3737
implementation("androidx.window:window:1.4.0")
3838
implementation("androidx.window:window-core:1.4.0")
3939
implementation("androidx.compose.material3:material3-android:1.3.2")
40-
implementation(platform("androidx.compose:compose-bom:2025.06.00"))
40+
implementation(platform("androidx.compose:compose-bom:2025.07.00")) // Update requires Kotlin 2.
4141
implementation("androidx.compose.foundation:foundation-android:$composeVersion")
4242
implementation("androidx.compose.runtime:runtime-livedata:$composeVersion")
4343
implementation("androidx.compose.ui:ui-tooling-preview-android:$composeVersion")
@@ -46,18 +46,19 @@ dependencies {
4646
debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion")
4747
debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion")
4848

49-
androidTestImplementation("androidx.test:runner:1.6.2")
50-
androidTestImplementation("androidx.test:rules:1.6.1")
51-
androidTestImplementation("androidx.test.ext:junit:1.2.1")
49+
androidTestImplementation("androidx.test:runner:1.7.0")
50+
androidTestImplementation("androidx.test:rules:1.7.0")
51+
androidTestImplementation("androidx.test.ext:junit:1.3.0")
5252
androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
5353
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion")
54-
androidTestImplementation("io.mockk:mockk-android:1.14.0")
54+
androidTestImplementation("io.mockk:mockk-android:1.14.0") // Update requires Kotlin 2
5555
}
5656

5757
android {
5858
namespace = "com.salesforce.androidsdk"
5959
testNamespace = "com.salesforce.androidsdk.tests"
6060

61+
//noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0
6162
compileSdk = 35
6263

6364
defaultConfig {

‎libs/SalesforceSDK/src/com/salesforce/androidsdk/ui/components/PickerBottomSheet.kt‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ import androidx.compose.ui.focus.FocusRequester
9595
import androidx.compose.ui.focus.focusRequester
9696
import androidx.compose.ui.graphics.Color
9797
import androidx.compose.ui.platform.LocalContext
98+
import androidx.compose.ui.graphics.asImageBitmap
99+
import androidx.compose.ui.graphics.painter.BitmapPainter
98100
import androidx.compose.ui.res.painterResource
99101
import androidx.compose.ui.res.stringResource
100102
import androidx.compose.ui.semantics.contentDescription
@@ -393,13 +395,11 @@ internal fun PickerBottomSheet(
393395
if (listItem is UserAccount) {
394396
UserAccountListItem(
395397
displayName = listItem.displayName,
396-
loginServer = listItem.loginServer,
398+
loginServer = listItem.communityUrl ?: listItem.instanceServer,
397399
selected = selected,
398400
onItemSelected = { onItemSelected(listItem, true) },
399-
profilePhoto = listItem.profilePhoto?.let {
400-
painterResource(
401-
it.generationId
402-
)
401+
profilePhoto = listItem.profilePhoto?.let { bitmap ->
402+
BitmapPainter(bitmap.asImageBitmap())
403403
},
404404
)
405405
/*
@@ -413,10 +413,8 @@ internal fun PickerBottomSheet(
413413
loginServer = listItem.loginServer,
414414
selected = selected,
415415
onItemSelected = { onItemSelected(listItem, true) },
416-
profilePhoto = listItem.profilePhoto?.let {
417-
painterResource(
418-
it.generationId
419-
)
416+
profilePhoto = listItem.profilePhoto?.let { bitmap ->
417+
BitmapPainter(bitmap.asImageBitmap())
420418
},
421419
)
422420
}

0 commit comments

Comments
 (0)