From 7ca1196f0979768d562c5d38864540542674772a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 2 Sep 2023 07:57:52 +0000 Subject: [PATCH 1/3] chore(deps): bump kotlin_version Bumps `kotlin_version` from 1.7.22 to 1.9.10. Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 1.7.22 to 1.9.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.9.10) Updates `org.jetbrains.kotlin:kotlin-stdlib` from 1.7.22 to 1.9.10 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/v1.9.10/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.7.22...v1.9.10) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.jetbrains.kotlin:kotlin-stdlib dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../package_info_plus/package_info_plus/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info_plus/package_info_plus/android/build.gradle b/packages/package_info_plus/package_info_plus/android/build.gradle index e6ba1ff5ef..a6800c9257 100644 --- a/packages/package_info_plus/package_info_plus/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/android/build.gradle @@ -2,7 +2,7 @@ group 'dev.fluttercommunity.plus.packageinfo' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.22' + ext.kotlin_version = '1.9.10' repositories { google() From 110a19f92ff33830d4677034b6e6aa52292d41ad Mon Sep 17 00:00:00 2001 From: Joachim Nohl <43643339+nohli@users.noreply.github.com> Date: Sat, 2 Sep 2023 11:17:18 +0200 Subject: [PATCH 2/3] Create gradle-wrapper.properties --- .../android/gradle/wrapper/gradle-wrapper.properties | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..774fae8767 --- /dev/null +++ b/packages/package_info_plus/package_info_plus/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From b3bc5bfc602d1866c057fb1fbc35965ef284fa7a Mon Sep 17 00:00:00 2001 From: Joachim Nohl <43643339+nohli@users.noreply.github.com> Date: Sat, 2 Sep 2023 11:22:27 +0200 Subject: [PATCH 3/3] Update gradle files regarding kotlin --- .../package_info_plus/example/android/app/build.gradle | 10 ++++++++-- .../package_info_plus/example/android/build.gradle | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle index 694f84c95a..9b425e7e4e 100644 --- a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle @@ -22,6 +22,7 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { @@ -30,8 +31,12 @@ android { namespace 'io.flutter.plugins.packageinfoexample' compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } lintOptions { @@ -63,4 +68,5 @@ dependencies { testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test:runner:1.5.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" } diff --git a/packages/package_info_plus/package_info_plus/example/android/build.gradle b/packages/package_info_plus/package_info_plus/example/android/build.gradle index 2f24195bf5..89e483d327 100644 --- a/packages/package_info_plus/package_info_plus/example/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/build.gradle @@ -1,4 +1,5 @@ buildscript { + ext.kotlin_version = '1.9.10' repositories { google() mavenCentral() @@ -6,6 +7,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.1.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }