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

Update dependency com.adyen.checkout:drop-in to v5.7.1 #287

Merged
merged 37 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8cb1d15
Update dependency com.adyen.checkout:drop-in to v5.7.0
renovate[bot] Oct 14, 2024
c9ef944
Test workflow kotlin version with v1.9.10
Robert-SD Oct 15, 2024
9accdd8
set fail fast to false
Robert-SD Oct 15, 2024
15a6771
Set kotlin version to 1.8.22
Robert-SD Oct 15, 2024
d09ca64
Removed AGP 7 compatibility
Robert-SD Oct 15, 2024
cb89942
Updated gradle version
Robert-SD Oct 15, 2024
70cd389
Flutter version test
Robert-SD Oct 15, 2024
953241d
Revert gradle version update
Robert-SD Oct 15, 2024
72a9859
Reverted kotlin update
Robert-SD Oct 15, 2024
65af3c4
Test run
Robert-SD Oct 15, 2024
b6811fd
Test run
Robert-SD Oct 15, 2024
dc79f0f
Use gradle 8 for Flutter 3.16.x
Robert-SD Oct 15, 2024
7e95ebf
Add change to gradle 8
Robert-SD Oct 15, 2024
da632c1
print gradle wrapper version
Robert-SD Oct 15, 2024
8c18d82
Updated Android gradle plugin to v8
Robert-SD Oct 15, 2024
2b911f6
Fixed gradle replacement
Robert-SD Oct 15, 2024
cc1c01d
Updated to Kotlin 1.8.22
Robert-SD Oct 15, 2024
bc4928d
Test run
Robert-SD Oct 15, 2024
e7bd5f1
Test run
Robert-SD Oct 15, 2024
752e607
Set java version to 8
Robert-SD Oct 15, 2024
94b78b5
Set java version to 17 and bumped gradle plugin to v8.3
Robert-SD Oct 15, 2024
40067ae
Kotlin version test
Robert-SD Oct 15, 2024
57a49a4
Test with kotlin v1.9.0
Robert-SD Oct 15, 2024
dfe7318
Gradle v8.0 test
Robert-SD Oct 15, 2024
823733a
Test with kotlin v1.8.22
Robert-SD Oct 15, 2024
458d58e
Cat android gradle
Robert-SD Oct 15, 2024
046ed77
Test run
Robert-SD Oct 15, 2024
2a684fd
Test run
Robert-SD Oct 15, 2024
5bca6cf
Test run
Robert-SD Nov 13, 2024
bfdad57
Prepared missing Kotlin Options for Flutter 3.22.x
Robert-SD Nov 13, 2024
634eec2
Test
Robert-SD Nov 13, 2024
0cd00c4
Test run
Robert-SD Nov 13, 2024
e880366
Test run
Robert-SD Nov 13, 2024
552709e
Test run
Robert-SD Nov 13, 2024
ab47999
Another test run
Robert-SD Nov 13, 2024
509e284
Updated Android SDK to v5.7.1
Robert-SD Nov 14, 2024
8ab547d
Updated Android SDK to v5.8.0
Robert-SD Dec 9, 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
25 changes: 20 additions & 5 deletions .github/workflows/android_clean_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ jobs:
android_clean_build:
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
api-level: [ 34 ]
flutter-version: [ "3.16.0" ,"3.19.0", "3.22.0", "3.24.0" ]
flutter-version: [ 3.16.x ,3.19.x, 3.22.x, 3.24.x ]

steps:
- name: Provide more disk space
Expand Down Expand Up @@ -44,16 +45,30 @@ jobs:
flutter create --template=app --platforms=android,ios demo_project
cd demo_project

#Change Kotlin version for Flutter 3.16
sed -i "s/ext.kotlin_version = '1.7.10'/ext.kotlin_version = '1.8.10'/g" android/build.gradle
#Change Kotlin version and gradle wrapper for Flutter 3.16
sed -i "s/ext.kotlin_version = '1.7.10'/ext.kotlin_version = '1.8.22'/g" android/build.gradle
sed -i "s/gradle-7.5-all/gradle-8.0-all/g" android/gradle/wrapper/gradle-wrapper.properties

#Change Kotlin version for Flutter 3.19+
sed -i 's/"org.jetbrains.kotlin.android" version "1.7.10"/"org.jetbrains.kotlin.android" version "1.8.10"/g' android/settings.gradle
#Change Kotlin version and gradle wrapper for Flutter 3.19+
sed -i 's/"org.jetbrains.kotlin.android" version "1.7.10"/"org.jetbrains.kotlin.android" version "1.8.22"/g' android/settings.gradle
sed -i "s/gradle-7.6.3-all/gradle-8.0-all/g" android/gradle/wrapper/gradle-wrapper.properties

#Change minSdk and compileSdk version
sed -i 's/flutter.compileSdkVersion/34/g' android/app/build.gradle
sed -i 's/flutter.minSdkVersion/21/g' android/app/build.gradle

#Change to Android Gradle plugin to v8
sed -i 's/id "com.android.application" version "7.3.0"/id "com.android.application" version "8.1.4"/g' android/settings.gradle

#Add missing Kotlin options for Flutter 3.22
if [ ${{ matrix.flutter-version }} == '3.22.x' ]; then
sed -i '/defaultConfig {/i \
kotlinOptions {\
jvmTarget = 'JavaVersion.VERSION_1_8'\
}\
' android/app/build.gradle
fi

dart pub add 'adyen_checkout:{"path":"../"}'
flutter build apk --debug

Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Improved dynamic viewport of card component.
* Added the missing loading bottom sheet for the advanced flow google pay component.
* Updated iOS SDK to v5.14.0.
* Updated Android SDK to v5.8.0. Gradle v8 is now mandatory.

## 1.1.0

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ release a new version when we need to.
* Add the return URL handler to your AppDelegate in your [native iOS](https://github.com/Adyen/adyen-flutter/blob/5301abab34773e820c4fd38be54d3bf4bb247fd6/example/ios/Runner/AppDelegate.swift#L18) layer.
* Add a custom [URL scheme](https://developer.apple.com/documentation/xcode/defining-a-custom-url-scheme-for-your-app) that matches the returnUrl you use.


## Integration

Depending on the [server-side flow](https://docs.adyen.com/online-payments/build-your-integration/)
Expand Down
10 changes: 1 addition & 9 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,7 @@ android {
}

dependencies {
implementation('com.adyen.checkout:drop-in:5.6.0') {
//Excluding the latest androidx lifecycle livedata core version because it is not compatible with AGP 7.
//This would break the default Flutter Gradle compatibility. More information: https://issuetracker.google.com/issues/336164417
exclude group: 'androidx.lifecycle', module: 'lifecycle-runtime-ktx'
exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
}

implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.7.0'
implementation('com.adyen.checkout:drop-in:5.8.0')
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
testImplementation 'org.jetbrains.kotlin:kotlin-test'
testImplementation 'org.mockito:mockito-core:5.14.2'
Expand Down
Loading