Skip to content

fix: (device_info_plus): Migrate Plugin to Built-in Kotlin #3865

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

Open
ravi84184 wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −15
Open

fix: (device_info_plus): Migrate Plugin to Built-in Kotlin #3865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 8 additions & 5 deletions packages/device_info_plus/device_info_plus/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ group 'dev.fluttercommunity.plus.device_info'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '2.2.0'
ext.kotlin_version = '2.2.20'
repositories {
google()
mavenCentral()
Expand All @@ -22,7 +22,7 @@ rootProject.allprojects {
}

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


android {
namespace 'dev.fluttercommunity.plus.device_info'
Expand All @@ -33,9 +33,7 @@ android {
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = 17
}


defaultConfig {
minSdk 19
Expand All @@ -50,3 +48,8 @@ android {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
}
}
kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}
13 changes: 6 additions & 7 deletions packages/device_info_plus/device_info_plus/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

Expand All @@ -25,16 +24,12 @@ if (flutterVersionName == null) {
android {
namespace 'io.flutter.plugins.deviceinfoexample.example'
compileSdk = flutter.compileSdkVersion

ndkVersion = "28.2.13676358"
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = 17
}

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
Expand All @@ -59,7 +54,11 @@ android {
}
}
}

kotlin {
compilerOptions {
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
}
}
flutter {
source '../..'
}
4 changes: 4 additions & 0 deletions packages/device_info_plus/device_info_plus/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 ...evice_info_plus/device_info_plus/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 @@
#Tue Oct 05 15:15:38 CEST 2021
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
4 changes: 2 additions & 2 deletions packages/device_info_plus/device_info_plus/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.12.1" apply false
id "org.jetbrains.kotlin.android" version "2.2.0" apply false
id "com.android.application" version "8.11.1" apply false
id "org.jetbrains.kotlin.android" version "2.2.20" apply false
}

include ":app"
Loading