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

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
e65711d
Update dependency com.adyen.checkout:drop-in to v5.7.0
renovate[bot] Oct 14, 2024
96a3df7
Test workflow kotlin version with v1.9.10
Robert-SD Oct 15, 2024
fca5ee7
set fail fast to false
Robert-SD Oct 15, 2024
7c6b829
Set kotlin version to 1.8.22
Robert-SD Oct 15, 2024
a06d779
Removed AGP 7 compatibility
Robert-SD Oct 15, 2024
3a99800
Updated gradle version
Robert-SD Oct 15, 2024
dc93af4
Flutter version test
Robert-SD Oct 15, 2024
6f08a12
Revert gradle version update
Robert-SD Oct 15, 2024
1d43102
Reverted kotlin update
Robert-SD Oct 15, 2024
d9df691
Test run
Robert-SD Oct 15, 2024
9d36121
Test run
Robert-SD Oct 15, 2024
2ecd641
Use gradle 8 for Flutter 3.16.x
Robert-SD Oct 15, 2024
72ed24d
Add change to gradle 8
Robert-SD Oct 15, 2024
e7d2548
print gradle wrapper version
Robert-SD Oct 15, 2024
4465db3
Updated Android gradle plugin to v8
Robert-SD Oct 15, 2024
e125019
Fixed gradle replacement
Robert-SD Oct 15, 2024
e1ab16b
Updated to Kotlin 1.8.22
Robert-SD Oct 15, 2024
ab1a889
Test run
Robert-SD Oct 15, 2024
3822fb2
Test run
Robert-SD Oct 15, 2024
da03828
Set java version to 8
Robert-SD Oct 15, 2024
75cf021
Set java version to 17 and bumped gradle plugin to v8.3
Robert-SD Oct 15, 2024
1c9baf3
Kotlin version test
Robert-SD Oct 15, 2024
97be109
Test with kotlin v1.9.0
Robert-SD Oct 15, 2024
5b70825
Gradle v8.0 test
Robert-SD Oct 15, 2024
a50e2a0
Test with kotlin v1.8.22
Robert-SD Oct 15, 2024
35e7098
Cat android gradle
Robert-SD Oct 15, 2024
0961df2
Test run
Robert-SD Oct 15, 2024
b2b8fd3
Test run
Robert-SD Oct 15, 2024
008e07e
Test run
Robert-SD Nov 13, 2024
7e77fa3
Prepared missing Kotlin Options for Flutter 3.22.x
Robert-SD Nov 13, 2024
7cc4b25
Test
Robert-SD Nov 13, 2024
e58566d
Test run
Robert-SD Nov 13, 2024
63da134
Test run
Robert-SD Nov 13, 2024
9f1983b
Test run
Robert-SD Nov 13, 2024
a1d2452
Another test run
Robert-SD Nov 13, 2024
7428463
Updated Android SDK to v5.7.1
Robert-SD Nov 14, 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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
## 1.1.1
## 1.2.0

* Added the missing loading bottom sheet for the advanced flow google pay component.
* Updated iOS SDK to v5.13.0.
* Updated Android SDK to v5.7.1. Gradle v8 is now mandatory.

## 1.1.0

Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,9 @@ Required versions:

* [Checkout API v71](https://docs.adyen.com/api-explorer/Checkout/71/overview) or later.
* [iOS 12](https://support.apple.com/en-us/118387) or later.
* [Android 5.0](https://www.android.com/versions/lollipop-5-0/) or later with compileSdk set to 34.
Google will
change [target API level requirements](https://support.google.com/googleplay/android-developer/answer/11926878?hl=en)
for Google Play apps starting August 31 2024.
* [Android 5.0](https://www.android.com/versions/lollipop-5-0/) or later.
* [Kotlin 1.8](https://kotlinlang.org/docs/releases.html) or later.
* [Gradle 8](https://developer.android.com/build/releases/gradle-plugin).

## 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.7.1')
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