Skip to content

Commit 0c9b0ad

Browse files
authored
feat(share_plus): Add support of built-in Kotlin (#3896)
1 parent 29195a9 commit 0c9b0ad

6 files changed

Lines changed: 16 additions & 8 deletions

File tree

packages/share_plus/share_plus/android/build.gradle.kts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version = "1.0-SNAPSHOT"
33

44
buildscript {
55
val kotlinVersion = "2.2.0"
6-
6+
77
repositories {
88
google()
99
mavenCentral()
@@ -25,10 +25,15 @@ allprojects {
2525

2626
plugins {
2727
id("com.android.library")
28-
id("kotlin-android")
2928
}
3029

31-
kotlin {
30+
val agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.substringBefore('.').toInt()
31+
32+
if (agpMajor < 9) {
33+
apply(plugin = "org.jetbrains.kotlin.android")
34+
}
35+
36+
project.extensions.configure(org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension::class.java) {
3237
compilerOptions {
3338
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
3439
}
@@ -44,7 +49,7 @@ android {
4449
}
4550

4651
defaultConfig {
47-
minSdk = 19
52+
minSdk = 21
4853
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
4954
}
5055

packages/share_plus/share_plus/example/android/app/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
android {
77
namespace = "io.flutter.plugins.shareexample"
88
compileSdk = flutter.compileSdkVersion
9+
ndkVersion = flutter.ndkVersion
910

1011
compileOptions {
1112
sourceCompatibility = JavaVersion.VERSION_17
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
3+
android.newDsl=false
4+
android.builtInKotlin=false
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
2+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
33
distributionPath=wrapper/dists
44
zipStorePath=wrapper/dists
55
zipStoreBase=GRADLE_USER_HOME

packages/share_plus/share_plus/example/android/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pluginManagement {
2020
plugins {
2121
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
2222
id("com.android.application") version "8.12.1" apply false
23-
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
23+
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
2424
}
2525

2626
include(":app")

packages/share_plus/share_plus/example/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ dependencies:
55
flutter:
66
sdk: flutter
77
share_plus: ^13.1.0
8-
image_picker: ^1.1.2
9-
file_selector: ^1.0.3
8+
image_picker: ^1.2.2
9+
file_selector: ^1.1.0
1010

1111
dev_dependencies:
1212
flutter_driver:

0 commit comments

Comments
 (0)