From b2119058516a3e6f434f391c1298c0d9f368d7be Mon Sep 17 00:00:00 2001 From: Volodymyr Date: Sun, 7 Sep 2025 23:19:22 +0300 Subject: [PATCH] feat(connectivity_plus)!: Change Android compile SDK, update Android build config --- packages/connectivity_plus/connectivity_plus/README.md | 5 ++--- .../connectivity_plus/android/build.gradle | 5 ++--- .../android/gradle/wrapper/gradle-wrapper.properties | 5 ----- .../connectivity_plus/example/android/app/build.gradle | 6 +++--- .../connectivity_plus/example/android/gradle.properties | 1 - .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- .../connectivity_plus/example/android/settings.gradle | 2 +- 7 files changed, 9 insertions(+), 17 deletions(-) delete mode 100644 packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/connectivity_plus/connectivity_plus/README.md b/packages/connectivity_plus/connectivity_plus/README.md index 80528cb517..fcaf684b2c 100644 --- a/packages/connectivity_plus/connectivity_plus/README.md +++ b/packages/connectivity_plus/connectivity_plus/README.md @@ -26,10 +26,9 @@ This plugin allows Flutter apps to discover network connectivity types that can - Dart >=3.3.0 <4.0.0 - iOS >=12.0 - macOS >=10.14 -- Android `compileSDK` 34 - Java 17 -- Android Gradle Plugin >=8.3.0 -- Gradle wrapper >=8.4 +- Android Gradle Plugin >=8.12.1 +- Gradle wrapper >=8.13 ## Usage diff --git a/packages/connectivity_plus/connectivity_plus/android/build.gradle b/packages/connectivity_plus/connectivity_plus/android/build.gradle index 6d8c5881be..2ce55a5905 100644 --- a/packages/connectivity_plus/connectivity_plus/android/build.gradle +++ b/packages/connectivity_plus/connectivity_plus/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.3.1' + classpath 'com.android.tools.build:gradle:8.12.1' } } @@ -22,9 +22,8 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdk 34 - namespace 'dev.fluttercommunity.plus.connectivity' + compileSdk = flutter.compileSdkVersion compileOptions { sourceCompatibility JavaVersion.VERSION_17 diff --git a/packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties b/packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index cae4528dfb..0000000000 --- a/packages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip -distributionPath=wrapper/dists -zipStorePath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME diff --git a/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle b/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle index 3efaaa1a6e..c3efd1699d 100644 --- a/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle +++ b/packages/connectivity_plus/connectivity_plus/example/android/app/build.gradle @@ -27,7 +27,7 @@ if (flutterVersionName == null) { } android { - compileSdk 34 + compileSdk = flutter.compileSdkVersion namespace 'io.flutter.plugins.connectivityexample' @@ -42,8 +42,8 @@ android { defaultConfig { applicationId "io.flutter.plugins.connectivityexample" - minSdk 21 - targetSdk 34 + minSdk flutter.minSdkVersion + targetSdk flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/connectivity_plus/connectivity_plus/example/android/gradle.properties b/packages/connectivity_plus/connectivity_plus/example/android/gradle.properties index 94adc3a3f9..d9cf55df7c 100644 --- a/packages/connectivity_plus/connectivity_plus/example/android/gradle.properties +++ b/packages/connectivity_plus/connectivity_plus/example/android/gradle.properties @@ -1,3 +1,2 @@ org.gradle.jvmargs=-Xmx1536M android.useAndroidX=true -android.enableJetifier=true diff --git a/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties index 032437da60..3641ebded3 100644 --- a/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/connectivity_plus/connectivity_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Oct 05 14:43:11 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle b/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle index 5fad357a02..a7021b0c27 100644 --- a/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle +++ b/packages/connectivity_plus/connectivity_plus/example/android/settings.gradle @@ -18,7 +18,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.3.1" apply false + id "com.android.application" version "8.12.1" apply false } include ":app"