Bump all dependencies. Fix User Switcher screen. #2757
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -18,16 +18,17 @@ dependencies { | |||
| api("androidx.appcompat:appcompat-resources:1.7.1") | ||||
| api("androidx.webkit:webkit:1.14.0") | ||||
| api("androidx.core:core-splashscreen:1.0.1") | ||||
| implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk | ||||
|
There was a problem hiding this comment.
|
||||
| androidTestImplementation("androidx.test:runner:1.7.0") | ||||
| androidTestImplementation("androidx.test:rules:1.7.0") | ||||
| androidTestImplementation("androidx.test.ext:junit:1.3.0") | ||||
| } | ||||
|
|
||||
| android { | ||||
| namespace = "com.salesforce.androidsdk.hybrid" | ||||
| testNamespace = "com.salesforce.androidsdk.phonegap" | ||||
|
|
||||
| //noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0 | ||||
| compileSdk = 35 | ||||
|
|
||||
| defaultConfig { | ||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -23,10 +23,10 @@ plugins { | |||
| dependencies { | ||||
| api(project(":libs:MobileSync")) | ||||
| api("com.facebook.react:react-android:0.79.3") | ||||
| implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk | ||||
|
There was a problem hiding this comment.
|
||||
| androidTestImplementation("androidx.test:runner:1.7.0") | ||||
| androidTestImplementation("androidx.test:rules:1.7.0") | ||||
| androidTestImplementation("androidx.test.ext:junit:1.3.0") | ||||
| androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0") | ||||
|
|
||||
| // JSC from node_modules | ||||
|
|
@@ -42,6 +42,7 @@ android { | |||
| namespace = "com.salesforce.androidsdk.reactnative" | ||||
| testNamespace = "com.salesforce.androidsdk.reactnative.tests" | ||||
|
|
||||
| //noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0 | ||||
| compileSdk = 35 | ||||
|
|
||||
| defaultConfig { | ||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -11,22 +11,22 @@ plugins { | |||
| } | ||||
|
|
||||
| dependencies { | ||||
| val composeVersion = "1.8.2" // Update requires Kotlin 2. | ||||
| val livecycleVersion = "2.8.7" // Update requires Kotlin 2. | ||||
| val androidXActivityVersion = "1.10.1" | ||||
|
|
||||
| api(project(":libs:SalesforceAnalytics")) | ||||
| api("com.squareup.okhttp3:okhttp:4.12.0") | ||||
| api("com.google.firebase:firebase-messaging:25.0.0") | ||||
| api("androidx.core:core:1.16.0") // Update requires API 36 compileSdk | ||||
|
There was a problem hiding this comment.
|
||||
| api("androidx.browser:browser:1.8.0") // Update requires API 36 compileSdk | ||||
|
There was a problem hiding this comment.
|
||||
| api("androidx.work:work-runtime-ktx:2.10.3") | ||||
|
|
||||
| implementation("com.google.android.material:material:1.13.0") // remove this when all xml is gone | ||||
| implementation("androidx.appcompat:appcompat:1.7.1") | ||||
| implementation("androidx.biometric:biometric:1.2.0-alpha05") | ||||
| implementation("androidx.lifecycle:lifecycle-extensions:2.2.0") | ||||
| implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk | ||||
|
There was a problem hiding this comment.
|
||||
| implementation("androidx.activity:activity-ktx:$androidXActivityVersion") | ||||
| implementation("androidx.activity:activity-compose:$androidXActivityVersion") | ||||
| implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$livecycleVersion") | ||||
|
There was a problem hiding this comment.
|
||||
|
|
@@ -37,7 +37,7 @@ dependencies { | |||
| implementation("androidx.window:window:1.4.0") | ||||
| implementation("androidx.window:window-core:1.4.0") | ||||
| implementation("androidx.compose.material3:material3-android:1.3.2") | ||||
| implementation(platform("androidx.compose:compose-bom:2025.07.00")) // Update requires Kotlin 2. | ||||
|
There was a problem hiding this comment.
|
||||
| implementation("androidx.compose.foundation:foundation-android:$composeVersion") | ||||
|
There was a problem hiding this comment.
|
||||
| implementation("androidx.compose.runtime:runtime-livedata:$composeVersion") | ||||
|
There was a problem hiding this comment.
|
||||
| implementation("androidx.compose.ui:ui-tooling-preview-android:$composeVersion") | ||||
|
There was a problem hiding this comment.
|
||||
|
|
@@ -46,18 +46,19 @@ dependencies { | |||
| debugImplementation("androidx.compose.ui:ui-tooling:$composeVersion") | ||||
|
There was a problem hiding this comment.
|
||||
| debugImplementation("androidx.compose.ui:ui-test-manifest:$composeVersion") | ||||
|
There was a problem hiding this comment.
|
||||
|
|
||||
| androidTestImplementation("androidx.test:runner:1.7.0") | ||||
| androidTestImplementation("androidx.test:rules:1.7.0") | ||||
| androidTestImplementation("androidx.test.ext:junit:1.3.0") | ||||
| androidTestImplementation("androidx.arch.core:core-testing:2.2.0") | ||||
| androidTestImplementation("androidx.compose.ui:ui-test-junit4:$composeVersion") | ||||
|
There was a problem hiding this comment.
|
||||
| androidTestImplementation("io.mockk:mockk-android:1.14.0") // Update requires Kotlin 2 | ||||
| } | ||||
|
|
||||
| android { | ||||
| namespace = "com.salesforce.androidsdk" | ||||
| testNamespace = "com.salesforce.androidsdk.tests" | ||||
|
|
||||
| //noinspection GradleDependency - Will be upgraded to 36 in Mobile SDK 14.0 | ||||
| compileSdk = 35 | ||||
|
|
||||
| defaultConfig { | ||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -95,6 +95,8 @@ import androidx.compose.ui.focus.FocusRequester | |
| import androidx.compose.ui.focus.focusRequester | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.graphics.asImageBitmap | ||
| import androidx.compose.ui.graphics.painter.BitmapPainter | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.semantics.contentDescription | ||
|
|
@@ -393,13 +395,11 @@ internal fun PickerBottomSheet( | |
| if (listItem is UserAccount) { | ||
| UserAccountListItem( | ||
| displayName = listItem.displayName, | ||
| loginServer = listItem.communityUrl ?: listItem.instanceServer, | ||
| selected = selected, | ||
| onItemSelected = { onItemSelected(listItem, true) }, | ||
| profilePhoto = listItem.profilePhoto?.let { bitmap -> | ||
| BitmapPainter(bitmap.asImageBitmap()) | ||
| }, | ||
| ) | ||
| /* | ||
|
|
@@ -413,10 +413,8 @@ internal fun PickerBottomSheet( | |
| loginServer = listItem.loginServer, | ||
| selected = selected, | ||
| onItemSelected = { onItemSelected(listItem, true) }, | ||
| profilePhoto = listItem.profilePhoto?.let { bitmap -> | ||
| BitmapPainter(bitmap.asImageBitmap()) | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||
|---|---|---|---|---|
|
|
@@ -14,13 +14,13 @@ dependencies { | |||
| //noinspection GradleDependency - Needs to line up with supported SQLCipher version. | ||||
| api("androidx.sqlite:sqlite:2.2.0") | ||||
| api("net.zetetic:sqlcipher-android:4.10.0") | ||||
| implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk | ||||
|
There was a problem hiding this comment.
|
||||
| androidTestImplementation("androidx.test:runner:1.7.0") | ||||
| androidTestImplementation("androidx.test:rules:1.7.0") | ||||
| androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0") | ||||
| androidTestImplementation("androidx.test.ext:junit:1.3.0") | ||||
| androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0") | ||||
| implementation("com.google.android.material:material:1.13.0") | ||||
| } | ||||
|
|
||||
| android { | ||||
|
|
||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,16 +5,16 @@ plugins { | |
|
|
||
| dependencies { | ||
| api(project(":libs:SalesforceSDK")) | ||
| implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk | ||
| } | ||
|
|
||
| android { | ||
| namespace = "com.salesforce.samples.appconfigurator" | ||
|
|
||
| compileSdk = 36 | ||
|
|
||
| defaultConfig { | ||
| targetSdk = 36 | ||
| minSdk = 28 | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,16 +7,16 @@ dependencies { | |
| api(project(":libs:SalesforceSDK")) | ||
| implementation("androidx.appcompat:appcompat:1.7.1") | ||
| implementation("androidx.appcompat:appcompat-resources:1.7.1") | ||
| implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk | ||
| } | ||
|
|
||
| android { | ||
| namespace = "com.salesforce.samples.configuredapp" | ||
|
|
||
| compileSdk = 36 | ||
|
|
||
| defaultConfig { | ||
| targetSdk = 36 | ||
| minSdk = 28 | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,9 +5,9 @@ plugins { | |
|
|
||
| dependencies { | ||
| implementation(project(":libs:SalesforceSDK")) | ||
| implementation("androidx.core:core-ktx:1.16.0") // Update requires API 36 compileSdk | ||
| implementation("androidx.tracing:tracing:1.3.0") | ||
| implementation("com.google.android.material:material:1.13.0") | ||
| androidTestImplementation("androidx.test:runner:1.5.1") { | ||
| exclude("com.android.support", "support-annotations") | ||
| } | ||
|
|
@@ -21,18 +21,18 @@ dependencies { | |
| androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0") { | ||
| exclude("com.android.support", "support-annotations") | ||
| } | ||
| androidTestImplementation("androidx.test.ext:junit:1.3.0") | ||
| androidTestImplementation("androidx.test.uiautomator:uiautomator:2.3.0") | ||
| } | ||
|
|
||
| android { | ||
| namespace = "com.salesforce.samples.restexplorer" | ||
| testNamespace = "com.salesforce.samples.restexplorer.tests" | ||
|
|
||
| compileSdk = 36 | ||
|
|
||
| defaultConfig { | ||
| targetSdk = 36 | ||
| minSdk = 28 | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.