Skip to content

Update config for flutter 3.44.8 #155

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

Merged
nicolas-chaix-didomi merged 2 commits into from
Aug 3, 2026
Merged

Update config for flutter 3.44.8 #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f882804
Upgrade Android toolchain to AGP 9.0.1, Gradle 9.1.0 and Kotlin 2.3.20
nicolas-chaix-didomi Jul 24, 2026
86a9be3
Fix iOS deployment target in Swift package manifest
nicolas-chaix-didomi Jul 24, 2026
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
18 changes: 10 additions & 8 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ group = "io.didomi.fluttersdk"
version = "2.30.0"

buildscript {
ext.kotlin_version = "2.2.20"
ext.kotlin_version = "2.3.20"
repositories {
google()
mavenCentral()
}

dependencies {
classpath("com.android.tools.build:gradle:8.13.0")
classpath("com.android.tools.build:gradle:9.0.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
}
}
Expand All @@ -25,7 +25,6 @@ rootProject.allprojects {
}

apply plugin: "com.android.library"
apply plugin: "kotlin-android"

android {
compileSdk = 36
Expand All @@ -37,7 +36,6 @@ android {

defaultConfig {
minSdk = 21
targetSdk = 36
multiDexEnabled = true

buildConfigField("String", "PLUGIN_VERSION", "\"" + version + "\"")
Expand All @@ -53,12 +51,16 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17
packaging {
resources {
excludes += "androidsupportmultidexversion.txt"
}
}
}

packagingOptions {
exclude("androidsupportmultidexversion.txt")
kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}

Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
11 changes: 7 additions & 4 deletions example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//noinspection GrPackage
plugins {
id("com.android.application")
id("kotlin-android")
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id("dev.flutter.flutter-gradle-plugin")
}

Expand All @@ -26,6 +26,7 @@ if (flutterVersionName == null) {
android {
compileSdk = 36
namespace = "io.didomi.flutter.sample"
ndkVersion = "29.0.14206865"

defaultConfig {
minSdkVersion = flutter.minSdkVersion
Expand All @@ -36,7 +37,6 @@ android {

applicationId = "io.didomi.flutter.sample"
multiDexEnabled = true
ndkVersion = "29.0.14206865"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

Expand All @@ -57,8 +57,11 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_17
}

kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}

Expand Down
4 changes: 4 additions & 0 deletions example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
# This builtInKotlin flag was added automatically by Flutter migrator
android.builtInKotlin=false
# This newDsl flag was added automatically by Flutter migrator
android.newDsl=false
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions example/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.13.0" apply false
id "org.jetbrains.kotlin.android" version "2.2.20" apply false
id "com.android.application" version "9.0.1" apply false
id "org.jetbrains.kotlin.android" version "2.3.20" apply false
}

include ":app"
2 changes: 1 addition & 1 deletion ios/didomi_sdk/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import PackageDescription
let package = Package(
name: "didomi_sdk",
platforms: [
.iOS("10.0")
.iOS("13.0")
],
products: [
.library(name: "didomi-sdk", targets: ["didomi_sdk"])
Expand Down