Skip to content

Tyler/material3 test #11802

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

Draft
tjclawson-stripe wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Tyler/material3 test #11802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
547e7cc
stash
tjclawson-stripe Sep 3, 2025
a78a428
text with icon
tjclawson-stripe Sep 5, 2025
e84440d
stash
tjclawson-stripe Sep 16, 2025
15457e1
Updates
tjclawson-stripe Oct 8, 2025
ae6bac3
Update
tjclawson-stripe Oct 8, 2025
6a404e1
stash
tjclawson-stripe Oct 15, 2025
236ce2e
update
tjclawson-stripe Oct 15, 2025
9c3d786
Update
tjclawson-stripe Oct 22, 2025
d6e991f
Update
tjclawson-stripe Oct 22, 2025
8aac880
blah
tjclawson-stripe Oct 23, 2025
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
7 changes: 6 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ buildscript {
classpath buildLibs.kotlinGradlePlugin
classpath buildLibs.kotlinSerializationPlugin
classpath buildLibs.paparazzi
configurations.configureEach {
resolutionStrategy {
force 'androidx.compose.material3:material3-android:1.4.0'
}
}
}
}

Expand All @@ -49,7 +54,7 @@ allprojects {
}

ext {
compileSdkVersion = 34
compileSdkVersion = 35

group_name = GROUP
version_name = VERSION_NAME
Expand Down
2 changes: 1 addition & 1 deletion connect-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies {
implementation libs.compose.materialIcons
implementation libs.compose.activity
implementation libs.compose.navigation
implementation libs.accompanist.systemUiController
// implementation libs.accompanist.systemUiController
debugImplementation libs.compose.uiTooling

// DI
Expand Down
10 changes: 5 additions & 5 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ext.versions = [
accompanist : '0.36.0',
accompanist : '0.37.3',
alipay : '15.8.12',
androidGradlePlugin : '8.8.2',
androidTest : '1.6.1',
Expand Down Expand Up @@ -100,12 +100,12 @@ ext.configs = [
ext.libs = [
accompanist : [
appCompatThemeAdapter: "com.google.accompanist:accompanist-themeadapter-appcompat:${versions.accompanist}",
flowLayout : "com.google.accompanist:accompanist-flowlayout:${versions.accompanist}",
//flowLayout : "com.google.accompanist:accompanist-flowlayout:${versions.accompanist}",
navigationAnimation : "com.google.accompanist:accompanist-navigation-animation:${versions.accompanist}",
navigationMaterial : "com.google.accompanist:accompanist-navigation-material:${versions.accompanist}",
systemUiController : "com.google.accompanist:accompanist-systemuicontroller:${versions.accompanist}",
materialThemeAdapter : "com.google.accompanist:accompanist-themeadapter-material:${versions.accompanist}",
material3ThemeAdapter : "com.google.accompanist:accompanist-themeadapter-material3:${versions.accompanist}",
//systemUiController : "com.google.accompanist:accompanist-systemuicontroller:${versions.accompanist}",
//materialThemeAdapter : "com.google.accompanist:accompanist-themeadapter-material:${versions.accompanist}",
//material3ThemeAdapter : "com.google.accompanist:accompanist-themeadapter-material3:${versions.accompanist}",
webView : "com.google.accompanist:accompanist-webview:${versions.accompanist}",
],
alipay : "com.alipay.sdk:alipaysdk-android:${versions.alipay}",
Expand Down
2 changes: 1 addition & 1 deletion example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
implementation project(':payments')
implementation project(':financial-connections')

implementation libs.accompanist.materialThemeAdapter
// implementation libs.accompanist.materialThemeAdapter
implementation libs.alipay
implementation libs.androidx.appCompat
implementation libs.androidx.constraintLayout
Expand Down
2 changes: 1 addition & 1 deletion identity-example/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ dependencies {
implementation project(':stripe-core')
implementation project(':stripe-ui-core')

implementation libs.accompanist.materialThemeAdapter
// implementation libs.accompanist.materialThemeAdapter
implementation libs.androidx.appCompat
implementation libs.androidx.browser
implementation libs.androidx.constraintLayout
Expand Down
2 changes: 1 addition & 1 deletion identity/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
implementation project(":stripe-ui-core")
implementation project(":ml-core:default")

implementation libs.accompanist.materialThemeAdapter
// implementation libs.accompanist.materialThemeAdapter
implementation libs.androidx.activity
implementation libs.androidx.appCompat
implementation libs.androidx.browser
Expand Down
37 changes: 33 additions & 4 deletions payment-method-messaging/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ apply plugin: 'checkstyle'
apply plugin: 'org.jetbrains.kotlin.plugin.parcelize'
apply plugin: 'kotlinx-serialization'
apply plugin: 'org.jetbrains.kotlin.plugin.compose'
apply plugin: 'dev.drewhamilton.poko'

android {
testOptions {
Expand All @@ -24,16 +25,44 @@ dependencies {
implementation project(":payments-core")
implementation project(":payments-ui-core")
implementation project(":stripe-ui-core")
api libs.kotlin.coroutines
implementation libs.kotlin.coroutinesAndroid
implementation libs.kotlin.serialization

// AndroidX
api libs.androidx.activity
implementation libs.androidx.annotation
implementation libs.androidx.browser
api libs.androidx.fragment
implementation libs.androidx.lifecycle
implementation libs.androidx.lifecycleCompose
implementation libs.androidx.savedState

implementation libs.androidx.activity
implementation libs.androidx.appCompat
implementation libs.androidx.constraintLayout
implementation libs.androidx.coreKtx
implementation libs.androidx.liveDataKtx
implementation libs.androidx.navigationFragment
implementation libs.androidx.navigationUi
implementation libs.androidx.preference
implementation libs.androidx.viewModel
implementation libs.compose.activity
implementation libs.compose.foundation
implementation libs.compose.liveData
implementation libs.compose.material
implementation libs.compose.navigation
implementation libs.compose.materialIcons
implementation libs.compose.materialIconsExtended
implementation libs.compose.ui
implementation libs.dagger
implementation libs.kotlin.coroutines
implementation libs.kotlin.coroutinesAndroid
implementation libs.compose.uiTooling
implementation libs.compose.viewModels
implementation libs.kotlin.serialization
implementation libs.material


// DI
implementation libs.dagger
implementation ('androidx.compose.material3:material3-android:1.4.0')
ksp libs.daggerCompiler

testImplementation testLibs.androidx.archCore
Expand Down
56 changes: 0 additions & 56 deletions ...rc/main/java/com/stripe/android/paymentmethodmessaging/view/PaymentMethodMessageMapper.kt
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ...rc/main/java/com/stripe/android/paymentmethodmessaging/view/PaymentMethodMessagingData.kt
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions ...c/main/java/com/stripe/android/paymentmethodmessaging/view/PaymentMethodMessagingState.kt
View file
Open in desktop

This file was deleted.

Loading