From 5926e8e7bc56b8577900c0cc0d41c44e7947f6dc Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 21 Jun 2026 19:36:02 +0300 Subject: [PATCH] feat(share_plus): Add support of built-in Kotlin --- .../share_plus/share_plus/android/build.gradle.kts | 13 +++++++++---- .../share_plus/example/android/app/build.gradle.kts | 1 + .../share_plus/example/android/gradle.properties | 2 ++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../share_plus/example/android/settings.gradle.kts | 2 +- packages/share_plus/share_plus/example/pubspec.yaml | 4 ++-- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/packages/share_plus/share_plus/android/build.gradle.kts b/packages/share_plus/share_plus/android/build.gradle.kts index da62743c98..9a05b0dee6 100644 --- a/packages/share_plus/share_plus/android/build.gradle.kts +++ b/packages/share_plus/share_plus/android/build.gradle.kts @@ -3,7 +3,7 @@ version = "1.0-SNAPSHOT" buildscript { val kotlinVersion = "2.2.0" - + repositories { google() mavenCentral() @@ -25,10 +25,15 @@ allprojects { plugins { id("com.android.library") - id("kotlin-android") } -kotlin { +val agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.substringBefore('.').toInt() + +if (agpMajor < 9) { + apply(plugin = "org.jetbrains.kotlin.android") +} + +project.extensions.configure(org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension::class.java) { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 } @@ -44,7 +49,7 @@ android { } defaultConfig { - minSdk = 19 + minSdk = 21 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/packages/share_plus/share_plus/example/android/app/build.gradle.kts b/packages/share_plus/share_plus/example/android/app/build.gradle.kts index d2c7e60807..40778296b3 100644 --- a/packages/share_plus/share_plus/example/android/app/build.gradle.kts +++ b/packages/share_plus/share_plus/example/android/app/build.gradle.kts @@ -6,6 +6,7 @@ plugins { android { namespace = "io.flutter.plugins.shareexample" compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/packages/share_plus/share_plus/example/android/gradle.properties b/packages/share_plus/share_plus/example/android/gradle.properties index d9cf55df7c..f0eec2041b 100644 --- a/packages/share_plus/share_plus/example/android/gradle.properties +++ b/packages/share_plus/share_plus/example/android/gradle.properties @@ -1,2 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true +android.newDsl=false +android.builtInKotlin=false diff --git a/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties index c0bc428bc1..cad3db0793 100644 --- a/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/share_plus/share_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/share_plus/share_plus/example/android/settings.gradle.kts b/packages/share_plus/share_plus/example/android/settings.gradle.kts index 388d07202a..c5bededd98 100644 --- a/packages/share_plus/share_plus/example/android/settings.gradle.kts +++ b/packages/share_plus/share_plus/example/android/settings.gradle.kts @@ -20,7 +20,7 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" id("com.android.application") version "8.12.1" apply false - id("org.jetbrains.kotlin.android") version "2.2.0" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") diff --git a/packages/share_plus/share_plus/example/pubspec.yaml b/packages/share_plus/share_plus/example/pubspec.yaml index a42d302c99..41c34283dd 100644 --- a/packages/share_plus/share_plus/example/pubspec.yaml +++ b/packages/share_plus/share_plus/example/pubspec.yaml @@ -5,8 +5,8 @@ dependencies: flutter: sdk: flutter share_plus: ^13.1.0 - image_picker: ^1.1.2 - file_selector: ^1.0.3 + image_picker: ^1.2.2 + file_selector: ^1.1.0 dev_dependencies: flutter_driver: