Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix : #5405 Feature/replace deprecated bundle calls #5611

Closed
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'upstream/develop' into feature/replace-…
…deprecated-bundle-calls
TanishMoral11 committed Dec 24, 2024
commit ec923efe5e6ca608720df1ca62b34cfe64a69278
Original file line number Diff line number Diff line change
@@ -26,8 +26,12 @@ class TopicPracticeFragment : InjectableFragment() {
const val TOPIC_PRACTICE_FRAGMENT_STATE_KEY = "TopicPracticeFragment.state"

/** Returns a new [TopicPracticeFragment]. */
<<<<<<< HEAD
fun newInstance(internalProfileId: Int, topicId: String): TopicPracticeFragment {
val profileId = ProfileId.newBuilder().setInternalId(internalProfileId).build()
=======
fun newInstance(profileId: ProfileId, topicId: String): TopicPracticeFragment {
>>>>>>> upstream/develop
val args = TopicPracticeFragmentArguments.newBuilder().apply {
this.topicId = topicId
}.build()
@@ -68,6 +72,7 @@ class TopicPracticeFragment : InjectableFragment() {
entry.value.valuesList.toMutableList()
} as HashMap<Int, MutableList<String>>
}
<<<<<<< HEAD

val args = arguments?.let {
BundleCompat.getSerializable(
@@ -79,6 +84,15 @@ class TopicPracticeFragment : InjectableFragment() {

val internalProfileId = arguments?.extractCurrentUserProfileId()?.internalId ?: -1
val topicId = checkNotNull(args.topicId) {
=======
val args = arguments?.getProto(
TOPIC_PRACTICE_FRAGMENT_ARGUMENTS_KEY,
TopicPracticeFragmentArguments.getDefaultInstance()
)
val profileId = arguments?.extractCurrentUserProfileId() ?: ProfileId.newBuilder()
.setInternalId(-1).build()
val topicId = checkNotNull(args?.topicId) {
>>>>>>> upstream/develop
"Expected topic ID to be included in arguments for TopicPracticeFragment."
}

2 changes: 1 addition & 1 deletion data/build.gradle
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.appcompat:appcompat:1.0.2',
'androidx.appcompat:appcompat:1.6.0',
'com.google.dagger:dagger:2.41',
'com.google.guava:guava:28.1-android',
'com.google.protobuf:protobuf-javalite:3.17.3',
2 changes: 1 addition & 1 deletion domain/build.gradle
Original file line number Diff line number Diff line change
@@ -83,7 +83,7 @@ android.sourceSets.test.kotlin.exclude(filesToExclude)
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.appcompat:appcompat:1.0.2',
'androidx.appcompat:appcompat:1.6.0',
'androidx.exifinterface:exifinterface:1.0.0-rc01',
'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03',
'androidx.lifecycle:lifecycle-extensions:2.0.0',
4 changes: 2 additions & 2 deletions scripts/assets/maven_dependencies.textproto
Original file line number Diff line number Diff line change
@@ -54,8 +54,8 @@ maven_dependency {
}
}
maven_dependency {
artifact_name: "androidx.appcompat:appcompat-resources:1.3.1"
artifact_version: "1.3.1"
artifact_name: "androidx.appcompat:appcompat-resources:1.6.0"
artifact_version: "1.6.0"
license {
license_name: "The Apache Software License, Version 2.0"
original_link: "https://www.apache.org/licenses/LICENSE-2.0.txt"
2 changes: 1 addition & 1 deletion testing/build.gradle
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.annotation:annotation:1.1.0',
'androidx.appcompat:appcompat:1.1.0',
'androidx.appcompat:appcompat:1.6.0',
'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03',
'androidx.core:core-ktx:1.15.0',
"androidx.test:core:1.0.0",
2 changes: 1 addition & 1 deletion third_party/versions.bzl
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ https://github.com/oppia/oppia-android/wiki/Updating-Maven-Dependencies
MAVEN_PRODUCTION_DEPENDENCY_VERSIONS = {
"androidx.activity:activity-compose": "1.4.0",
"androidx.annotation:annotation": "1.1.0",
"androidx.appcompat:appcompat": "1.3.1",
"androidx.appcompat:appcompat": "1.6.0",
"androidx.compose.compiler:compiler": "1.1.1",
"androidx.compose.foundation:foundation": "1.1.1",
"androidx.compose.foundation:foundation-layout": "1.1.1",
2 changes: 1 addition & 1 deletion utility/build.gradle
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ android.sourceSets.test.kotlin.exclude(filesToExclude)
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation(
'androidx.appcompat:appcompat:1.0.2',
'androidx.appcompat:appcompat:1.6.0',
'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0-alpha03',
'androidx.work:work-runtime-ktx:2.4.0',
'com.github.oppia:androidsvg:5bc9c7553e94c3476e8ea32baea3c77567228fcd',
You are viewing a condensed version of this merge commit. You can view the full changes here.