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

Updated Android SDK to v5.9.1 and set compile SDK to 35 #372

Merged
merged 4 commits into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 6 additions & 4 deletions .github/workflows/android_clean_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -53,21 +55,21 @@ 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

# 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
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
Expand All @@ -28,7 +28,7 @@ apply from: 'jacoco.gradle'

android {
namespace = "com.adyen.checkout.flutter"
compileSdk 34
compileSdk 35

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading