From c5ed59cb0cbce32cb665ec8dd6402aa4468ea30f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20St=C3=B8ttrup=20Nielsen?= <890725+larssn@users.noreply.github.com> Date: Thu, 17 Oct 2024 18:14:18 +0200 Subject: [PATCH] chore: upgraded gradle to 8.7.1 Removed redundant configuration --- android/build.gradle | 18 +++++++------- android/gradle.properties | 4 +--- android/settings.gradle | 4 ++-- example/android/app/build.gradle | 19 +++++++-------- .../app/src/profile/AndroidManifest.xml | 3 +-- example/android/gradle.properties | 5 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 6 ++--- example/pubspec.lock | 24 +++++++++---------- 9 files changed, 42 insertions(+), 43 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 83cccb8..385af5a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -14,14 +14,19 @@ allprojects { group 'im.nfc.flutter_nfc_kit' android { + if (project.android.hasProperty("namespace")) { + namespace 'im.nfc.flutter_nfc_kit' + } - namespace 'im.nfc.flutter_nfc_kit' - - compileSdkVersion 34 + compileSdk 35 compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" } sourceSets { @@ -37,7 +42,4 @@ android { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KotlinVersion" - implementation "org.jetbrains.kotlin:kotlin-reflect:$KotlinVersion" - implementation 'androidx.core:core-ktx:1.12.0' } diff --git a/android/gradle.properties b/android/gradle.properties index 6d30e1f..4d3226a 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,5 +1,3 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true -AGPVersion=7.4.2 -KotlinVersion=1.9.23 \ No newline at end of file +android.enableJetifier=true \ No newline at end of file diff --git a/android/settings.gradle b/android/settings.gradle index b30c81d..a049717 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -5,8 +5,8 @@ pluginManagement { mavenCentral() } plugins { - id 'com.android.library' version "${AGPVersion}" - id 'org.jetbrains.kotlin.android' version "${KotlinVersion}" + id 'com.android.library' version '8.7.1' + id 'org.jetbrains.kotlin.android' version '2.0.21' } } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 477d9d6..bf1dbc5 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -4,7 +4,6 @@ plugins { id "dev.flutter.flutter-gradle-plugin" } - def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -24,26 +23,27 @@ if (flutterVersionName == null) { } android { - namespace 'im.nfc.flutter_nfc_kit.example' - compileSdkVersion 34 + compileSdk 35 compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = "1.8" } sourceSets { main.java.srcDirs += 'src/main/kotlin' } - defaultConfig { applicationId "im.nfc.flutter_nfc_kit_example" - minSdkVersion 26 - targetSdkVersion 34 - compileSdkVersion 34 + minSdk 26 + targetSdk flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -65,5 +65,4 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$KotlinVersion" } diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml index 38ea911..f880684 100644 --- a/example/android/app/src/profile/AndroidManifest.xml +++ b/example/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + diff --git a/example/android/gradle.properties b/example/android/gradle.properties index 6d30e1f..1310f7a 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -1,5 +1,6 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true android.enableJetifier=true -AGPVersion=7.4.2 -KotlinVersion=1.9.23 \ No newline at end of file +android.defaults.buildfeatures.buildconfig=true +android.nonTransitiveRClass=false +android.nonFinalResIds=false \ No newline at end of file diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index edeb00a..4b801ad 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip diff --git a/example/android/settings.gradle b/example/android/settings.gradle index f63d155..9c3a2b5 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "${AGPVersion}" apply false - id "org.jetbrains.kotlin.android" version "${KotlinVersion}" apply false + id "com.android.application" version "8.7.1" apply false + id "org.jetbrains.kotlin.android" version "2.0.21" apply false } -include ":app" +include ":app" \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 394cd08..b9c833a 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -123,18 +123,18 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" url: "https://pub.dev" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" url: "https://pub.dev" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: @@ -163,18 +163,18 @@ packages: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec url: "https://pub.dev" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 url: "https://pub.dev" source: hosted - version: "1.12.0" + version: "1.15.0" ndef: dependency: transitive description: @@ -248,10 +248,10 @@ packages: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" url: "https://pub.dev" source: hosted - version: "0.7.0" + version: "0.7.2" typed_data: dependency: transitive description: @@ -280,10 +280,10 @@ packages: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" url: "https://pub.dev" source: hosted - version: "14.2.1" + version: "14.2.5" sdks: dart: ">=3.3.0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54"