-
Notifications
You must be signed in to change notification settings - Fork 68
Merge v6 into main #2128
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
Merged
Merged
Merge v6 into main #2128
Conversation
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
COAND-1084
COAND-1084
COAND-1084
COAND-1084
COAND-1084
COAND-1084
During the v6 refactor everything is subject to change, so if we add docs now we might forget to update them. COAND-1084
COAND-1084
After updating dependencies, generated functions for parcelable classes are now final. COAND-1084
COAND-1084
This gives better performance when used in compose. COAND-1084
Because the namespace started the same as :ui-core there were build issues. As a temporary workaround the namespace was changed. COAND-1084
COAND-1084
This allows us to directly use colors without the need to map it on every usage. COAND-1084
COAND-1073 COAND-1074 COAND-1075
COAND-1073 COAND-1075
COAND-1073
COAND-1073 COAND-1075
COSDK-441
COSDK-441
COSDK-145
COSDK-145
COSDK-442
COSDK-442
COSDK-453
COSDK-453
COSDK-453
COSDK-453
COSDK-453
COSDK-453
COSDK-453
Before there was not enough vertical padding for the content of buttons. COSDK-147
COSDK-147
✅ No public API changes |
The following dependencies have been modified in this PR: ---
+++
@@ -1,10 +1,15 @@
androidx.activity:activity-compose:1.10.1
+androidx.activity:activity-compose:1.8.2
androidx.activity:activity-ktx:1.10.1
+androidx.activity:activity-ktx:1.8.2
androidx.activity:activity:1.0.0
androidx.activity:activity:1.10.1
+androidx.activity:activity:1.8.2
androidx.annotation:annotation-experimental:1.4.0
androidx.annotation:annotation-experimental:1.4.1
+androidx.annotation:annotation-jvm:1.8.1
androidx.annotation:annotation-jvm:1.9.1
+androidx.annotation:annotation:1.8.1
androidx.annotation:annotation:1.9.1
androidx.appcompat:appcompat-resources:1.7.0
androidx.appcompat:appcompat:1.7.0
@@ -12,6 +17,7 @@
androidx.arch.core:core-common:2.2.0
androidx.arch.core:core-runtime:2.0.0
androidx.arch.core:core-runtime:2.2.0
+androidx.autofill:autofill:1.0.0
androidx.autofill:autofill:1.3.0-rc01
androidx.browser:browser:1.8.0
androidx.cardview:cardview:1.0.0
@@ -23,6 +29,20 @@
androidx.collection:collection:1.1.0
androidx.collection:collection:1.4.2
androidx.collection:collection:1.4.4
+androidx.compose.animation:animation-android:1.7.8
+androidx.compose.animation:animation-core-android:1.7.8
+androidx.compose.animation:animation-core:1.7.8
+androidx.compose.animation:animation:1.7.8
+androidx.compose.foundation:foundation-android:1.7.8
+androidx.compose.foundation:foundation-layout-android:1.7.8
+androidx.compose.foundation:foundation-layout:1.7.8
+androidx.compose.foundation:foundation:1.7.8
+androidx.compose.material3:material3-android:1.3.2
+androidx.compose.material3:material3:1.3.2
+androidx.compose.material:material-icons-core-android:1.7.8
+androidx.compose.material:material-icons-core:1.7.8
+androidx.compose.material:material-ripple-android:1.7.8
+androidx.compose.material:material-ripple:1.7.8
androidx.compose.runtime:runtime-android:1.7.8
androidx.compose.runtime:runtime-saveable-android:1.7.8
androidx.compose.runtime:runtime-saveable:1.7.8
@@ -34,19 +54,23 @@
androidx.compose.ui:ui-graphics:1.7.8
androidx.compose.ui:ui-text-android:1.7.8
androidx.compose.ui:ui-text:1.7.8
+androidx.compose.ui:ui-tooling-preview-android:1.7.8
+androidx.compose.ui:ui-tooling-preview:1.7.8
androidx.compose.ui:ui-unit-android:1.7.8
androidx.compose.ui:ui-unit:1.7.8
androidx.compose.ui:ui-util-android:1.7.8
androidx.compose.ui:ui-util:1.7.8
androidx.compose.ui:ui:1.7.8
-androidx.compose:compose-bom:2025.03.00
+androidx.compose:compose-bom:2025.04.00
androidx.concurrent:concurrent-futures:1.1.0
androidx.constraintlayout:constraintlayout-core:1.1.1
androidx.constraintlayout:constraintlayout:2.2.1
androidx.coordinatorlayout:coordinatorlayout:1.1.0
androidx.core:core-ktx:1.13.0
+androidx.core:core-ktx:1.13.1
androidx.core:core-viewtree:1.0.0
androidx.core:core:1.13.0
+androidx.core:core:1.13.1
androidx.core:core:1.2.0
androidx.cursoradapter:cursoradapter:1.0.0
androidx.customview:customview-poolingcontainer:1.0.0
@@ -60,36 +84,61 @@
androidx.emoji2:emoji2:1.3.0
androidx.fragment:fragment-ktx:1.8.6
androidx.fragment:fragment:1.1.0
+androidx.fragment:fragment:1.5.1
androidx.fragment:fragment:1.8.6
androidx.graphics:graphics-path:1.0.1
+androidx.hilt:hilt-navigation-compose:1.2.0
+androidx.hilt:hilt-navigation:1.2.0
androidx.interpolator:interpolator:1.0.0
androidx.legacy:legacy-support-core-utils:1.0.0
+androidx.lifecycle:lifecycle-common-java8:2.8.3
+androidx.lifecycle:lifecycle-common-java8:2.8.7
+androidx.lifecycle:lifecycle-common-jvm:2.8.3
androidx.lifecycle:lifecycle-common-jvm:2.8.7
androidx.lifecycle:lifecycle-common:2.1.0
+androidx.lifecycle:lifecycle-common:2.8.3
androidx.lifecycle:lifecycle-common:2.8.7
androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7
androidx.lifecycle:lifecycle-livedata-core:2.0.0
+androidx.lifecycle:lifecycle-livedata-core:2.8.3
androidx.lifecycle:lifecycle-livedata-core:2.8.7
androidx.lifecycle:lifecycle-livedata:2.0.0
androidx.lifecycle:lifecycle-livedata:2.8.7
+androidx.lifecycle:lifecycle-process:2.8.3
androidx.lifecycle:lifecycle-process:2.8.7
+androidx.lifecycle:lifecycle-runtime-android:2.8.3
androidx.lifecycle:lifecycle-runtime-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-compose:2.8.3
androidx.lifecycle:lifecycle-runtime-compose:2.8.7
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.3
androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
androidx.lifecycle:lifecycle-runtime:2.1.0
+androidx.lifecycle:lifecycle-runtime:2.8.3
androidx.lifecycle:lifecycle-runtime:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.3
androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.7
androidx.lifecycle:lifecycle-viewmodel-compose:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
androidx.lifecycle:lifecycle-viewmodel:2.1.0
+androidx.lifecycle:lifecycle-viewmodel:2.8.3
androidx.lifecycle:lifecycle-viewmodel:2.8.7
androidx.loader:loader:1.0.0
androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
+androidx.navigation:navigation-common-ktx:2.5.1
+androidx.navigation:navigation-common:2.5.1
+androidx.navigation:navigation-compose:2.5.1
+androidx.navigation:navigation-runtime-ktx:2.5.1
+androidx.navigation:navigation-runtime:2.5.1
androidx.print:print:1.0.0
+androidx.profileinstaller:profileinstaller:1.3.1
androidx.profileinstaller:profileinstaller:1.4.0
androidx.recyclerview:recyclerview:1.4.0
androidx.resourceinspection:resourceinspection-annotation:1.0.1
@@ -117,6 +166,11 @@
com.google.android.gms:play-services-tasks:18.2.0
com.google.android.gms:play-services-wallet:19.4.0
com.google.android.material:material:1.12.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.dagger:dagger-lint-aar:2.49
+com.google.dagger:dagger:2.49
+com.google.dagger:hilt-android:2.49
+com.google.dagger:hilt-core:2.49
com.google.errorprone:error_prone_annotations:2.15.0
com.google.guava:listenablefuture:1.0
com.squareup.moshi:moshi-kotlin:1.15.0
@@ -125,20 +179,25 @@
com.squareup.okio:okio-jvm:3.6.0
com.squareup.okio:okio:3.6.0
com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0
+javax.inject:javax.inject:1
org.bouncycastle:bcprov-jdk15to18:1.78.1
-org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.10
org.jetbrains.kotlin:kotlin-bom:1.8.22
-org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
+org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.10
org.jetbrains.kotlin:kotlin-reflect:1.8.22
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
-org.jetbrains.kotlin:kotlin-stdlib-common:2.0.20
+org.jetbrains.kotlin:kotlin-stdlib-common:2.1.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10
-org.jetbrains.kotlin:kotlin-stdlib:2.0.0
-org.jetbrains.kotlin:kotlin-stdlib:2.0.20
+org.jetbrains.kotlin:kotlin-stdlib:2.1.10
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.9.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.9.0
org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.9.0
org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.4.1
@@ -193,6 +252,7 @@
project :seven-eleven
project :twint
project :twint-action
+project :ui
project :ui-core
project :upi
project :voucher
To check the affected modules run the |
araratthehero
approved these changes
Jun 6, 2025
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Chore
[PRs only] Indicates any task that does not need to be mentioned in the public release notes
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.
Description
We are now ready to have v6 as the main branch. There is a separate v5 branch for if we need to do any development for v5.