diff --git a/android/build.gradle b/android/build.gradle index 5d4e3ff..c33dcee 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -24,19 +24,22 @@ rootProject.allprojects { ext { - compile_sdk_version = 32 - build_tools_version = "30.0.3" + compile_sdk_version = 35 min_sdk_version = 21 - target_sdk_version = 29 } android { - compileSdkVersion compile_sdk_version - buildToolsVersion build_tools_version + namespace 'com.optimizely.optimizely_flutter_sdk' + compileSdkVersion rootProject.hasProperty('flutter.compileSdkVersion') + ? rootProject.flutter.compileSdkVersion.toInteger() + : compile_sdk_version + + buildFeatures { + buildConfig true + } defaultConfig { minSdkVersion min_sdk_version - targetSdkVersion target_sdk_version versionCode 1 versionName version_name buildConfigField "String", "CLIENT_VERSION", "\"$version_name\"" @@ -73,9 +76,9 @@ dependencies { implementation 'com.github.tony19:logback-android:3.0.0' implementation 'org.slf4j:slf4j-api:2.0.7' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.0" implementation "com.optimizely.ab:android-sdk:5.0.1" - implementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.17.2' implementation ('com.google.guava:guava:19.0') { exclude group:'com.google.guava', module:'listenablefuture' } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 415ec79..bd22a12 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -24,8 +24,9 @@ if (flutterVersionName == null) { } android { - compileSdkVersion 32 - ndkVersion flutter.ndkVersion + namespace "com.optimizely.optimizely_flutter_sdk_example" + + compileSdkVersion flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -37,8 +38,9 @@ android { applicationId "com.optimizely.optimizely_flutter_sdk_example" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 21 - targetSdkVersion 32 + minSdkVersion flutter.minSdkVersion + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index cc5527d..db18181 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 5710b01..97284d6 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -26,8 +26,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.2.1" apply false - id "org.jetbrains.kotlin.android" version "1.6.10" apply false + id "com.android.application" version "8.7.0" apply false + id "org.jetbrains.kotlin.android" version "2.1.0" apply false } include ":app"