diff --git a/.github/workflows/android_clean_build.yml b/.github/workflows/android_clean_build.yml index 11a1c093..e7b418c3 100644 --- a/.github/workflows/android_clean_build.yml +++ b/.github/workflows/android_clean_build.yml @@ -10,8 +10,10 @@ jobs: strategy: fail-fast: false matrix: - api-level: [ 34 ] + api-level: [ 35 ] flutter-version: [ 3.16.x, 3.19.x, 3.22.x, 3.24.x, 3.27.x, 3.29.x ] + agp_version: [ 8.6.1 ] + gradle_version: [ 8.7 ] steps: - name: Provide more disk space @@ -53,13 +55,13 @@ jobs: } change_agp_version() { - sed -i 's/id "com.android.application" version "7.3.0"/id "com.android.application" version "8.1.4"/g' android/settings.gradle + sed -i 's/id "com.android.application" version "7.3.0"/id "com.android.application" version "${{ matrix.agp_version }}"/g' android/settings.gradle } # Change Kotlin version and adjust Gradle for Flutter 3.16.x if [[ "$FLUTTER_VERSION" == "3.16.x" ]]; then 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 + sed -i "s/gradle-7.5-all/gradle-${{ matrix.gradle_version }}-all/g" android/gradle/wrapper/gradle-wrapper.properties change_agp_version change_sdk_versions fi @@ -67,7 +69,7 @@ jobs: # Change Kotlin version and adjust Gradle for Flutter 3.19.x - 3.24.x versions if [[ "$FLUTTER_VERSION" == "3.19.x" || "$FLUTTER_VERSION" == "3.22.x" || "$FLUTTER_VERSION" == "3.24.x" ]]; then 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 + sed -i "s/gradle-7.6.3-all/gradle-${{ matrix.gradle_version }}-all/g" android/gradle/wrapper/gradle-wrapper.properties change_agp_version change_sdk_versions fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 26845db8..4641efab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Added bin lookup callbacks for Drop-In. - Set minimum SDK version to Flutter 3.16/Dart 3.2 - Android Components/Drop-in - version: [5.9.0](https://docs.adyen.com/online-payments/release-notes/?title%5B0%5D=Android+Components%2FDrop-in#releaseNote=2025-01-17-android-componentsdrop-in-5.9.0). + version: [5.9.1](https://docs.adyen.com/online-payments/release-notes/?title%5B0%5D=Android+Components%2FDrop-in#releaseNote=2025-02-24-android-componentsdrop-in-5.9.1). - iOS Components/Drop-in version: [5.16.0](https://docs.adyen.com/online-payments/release-notes/?title%5B0%5D=iOS+Components%2FDrop-in#releaseNote=2025-01-29-ios-componentsdrop-in-5.16.0) diff --git a/android/build.gradle b/android/build.gradle index 90862d5f..227ab61d 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.1' + classpath 'com.android.tools.build:gradle:8.6.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -28,7 +28,7 @@ apply from: 'jacoco.gradle' android { namespace = "com.adyen.checkout.flutter" - compileSdk 34 + compileSdk 35 compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -50,7 +50,7 @@ android { } dependencies { - implementation('com.adyen.checkout:drop-in:5.9.0') + implementation('com.adyen.checkout:drop-in:5.9.1') implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' testImplementation 'org.jetbrains.kotlin:kotlin-test' testImplementation 'org.mockito:mockito-core:5.16.0' diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 4d6272d9..45181329 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip