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.

Sign up for GitHub

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

Bump Aztec to 2.1.4 #12316

Merged
merged 3 commits into from
Aug 19, 2024
Merged

Bump Aztec to 2.1.4 #12316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96aec12
Bump Aztec to `2.1.4`
wzieba Aug 13, 2024
8498241
Add release notes
wzieba Aug 14, 2024
2f5dca0
Merge branch 'trunk' into bump_aztec_2_1_4
wzieba Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions WooCommerce/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ repositories {
includeGroup "com.automattic"
includeGroup "com.automattic.tracks"
includeGroup "com.gravatar"
includeGroup "org.wordpress.aztec"
}
}
maven {
Expand Down Expand Up @@ -281,13 +282,13 @@ dependencies {
exclude group: "org.wordpress", module: "fluxc"
}

implementation("com.github.wordpress-mobile.WordPress-Aztec-Android:aztec:$aztecVersion") {
implementation("org.wordpress:aztec:$aztecVersion") {
exclude group: "com.android.volley"
exclude group: "com.android.support"
exclude group: "org.wordpress", module: "utils"
}

implementation("com.github.wordpress-mobile.WordPress-Aztec-Android:glide-loader:$aztecVersion") {
implementation("org.wordpress.aztec:glide-loader:$aztecVersion") {
exclude group: "com.android.volley"
exclude group: "com.android.support"
exclude group: "org.wordpress", module: "utils"
Expand Down
2 changes: 1 addition & 1 deletion WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/WCBottomSheetDialogFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ open class WCBottomSheetDialogFragment : BottomSheetDialogFragment {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
dialog?.setOnShowListener {
val dialog = it as BottomSheetDialog
dialog.findViewById<View>(org.wordpress.aztec.R.id.design_bottom_sheet)?.let { sheet ->
dialog.findViewById<View>(com.google.android.material.R.id.design_bottom_sheet)?.let { sheet ->
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Referencing to org.wordpress.aztec was added in this commit: 4057a88 which looks like a mistake/unwanted changed rather than specifically reference design_bottom_sheet (3rd party xml file) from Aztec library.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, thanks for updating it! 🥇

// if device height is 32dp bigger than sheet height, show full sheet
val heightPixels = view.context.resources.displayMetrics.heightPixels
val topPadding = DisplayUtils.dpToPx(context, TOP_OFFSET_BEFORE_SHOWING_FULL_SHEET_DP)
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ ext {
googlePlayWearableVersion = '18.1.0'
coroutinesVersion = '1.8.1'
lifecycleVersion = '2.7.0'
aztecVersion = 'v1.3.45'
aztecVersion = 'v2.1.4'
flipperVersion = '0.176.1'
stateMachineVersion = '0.2.0'
coreKtxVersion = '1.13.1'
Expand Down
Loading