diff --git a/.github/workflows/prepare.yaml b/.github/workflows/prepare.yaml index b477d381..dadd364c 100644 --- a/.github/workflows/prepare.yaml +++ b/.github/workflows/prepare.yaml @@ -13,7 +13,7 @@ jobs: strategy: fail-fast: false matrix: - flutter-version: ["3.19.x"] + flutter-version: ["3.27.x"] steps: - name: Clone repository diff --git a/CHANGELOG.md b/CHANGELOG.md index d79085ae..e021ab1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## Unreleased + +- Dependencies update (#990) + - **Bump minimum Flutter to 3.27** + - Update leancode_lint and fix all new warnings + - Bump Gradle to 8.8 + - Bump Kotlin to 2.1.0 + ## 1.11.8 - Allow nullable Content-Yype (#966) diff --git a/android/build.gradle b/android/build.gradle index 982b318e..30a8d4fb 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -9,9 +9,9 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:7.4.2" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0" - classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.0" + classpath "com.android.tools.build:gradle:8.8.0" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:12.1.2" } } @@ -21,7 +21,7 @@ repositories { } apply plugin: "com.android.library" -apply plugin: "kotlin-android" +apply plugin: "org.jetbrains.kotlin.android" apply plugin: "org.jlleitschuh.gradle.ktlint" android { @@ -29,12 +29,12 @@ android { compileSdk = 35 compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 + jvmTarget = "11" // allWarningsAsErrors = true // TODO(bartekpacia): Re-enable } diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 863d78e1..ff9f9711 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -4,24 +4,6 @@ plugins { id "dev.flutter.flutter-gradle-plugin" } -def localProperties = new Properties() -def localPropertiesFile = rootProject.file("local.properties") -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader("UTF-8") { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty("flutter.versionCode") -if (flutterVersionCode == null) { - flutterVersionCode = "1" -} - -def flutterVersionName = localProperties.getProperty("flutter.versionName") -if (flutterVersionName == null) { - flutterVersionName = "1.0" -} - android { namespace = "vn.hunghd.example" compileSdk = 35 @@ -29,19 +11,19 @@ android { defaultConfig { applicationId "vn.hunghd.example" - minSdk = 21 - targetSdk = 35 - versionCode = flutterVersionCode.toInteger() - versionName = flutterVersionName + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8 + jvmTarget = "11" } buildTypes { @@ -53,5 +35,5 @@ android { } flutter { - source "../.." + source = "../.." } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 2fa91c5f..8357d848 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/example/android/settings.gradle b/example/android/settings.gradle index 1d686087..199814a5 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -18,8 +18,8 @@ pluginManagement { plugins { id("dev.flutter.flutter-plugin-loader") - id("com.android.application") version ('8.7.2') apply false - id("org.jetbrains.kotlin.android") version ("1.9.23") apply false + id("com.android.application") version ("8.8.0") apply false + id("org.jetbrains.kotlin.android") version ("2.1.0") apply false } include(":app") diff --git a/example/pubspec.yaml b/example/pubspec.yaml index a81cae34..ec4d22d9 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -4,22 +4,22 @@ version: 1.0.0+1 publish_to: none environment: - sdk: ">=3.3.0 <4.0.0" - flutter: ">=3.19.0" + sdk: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" dependencies: - device_info_plus: ^10.1.0 + device_info_plus: ^11.2.1 flutter: sdk: flutter flutter_downloader: path: ../ - path_provider: ^2.1.3 + path_provider: ^2.1.5 permission_handler: ^11.3.1 dev_dependencies: flutter_test: sdk: flutter - leancode_lint: ^12.1.0 + leancode_lint: ^15.0.0 flutter: uses-material-design: true diff --git a/lib/flutter_downloader.dart b/lib/flutter_downloader.dart index 20b78832..95556df4 100644 --- a/lib/flutter_downloader.dart +++ b/lib/flutter_downloader.dart @@ -9,8 +9,7 @@ /// /// * author: hunghd /// * email: hunghd.yb@gmail.com - -library flutter_downloader; +library; export 'src/downloader.dart'; export 'src/exceptions.dart'; diff --git a/lib/src/downloader.dart b/lib/src/downloader.dart index adbe4504..c36bf06b 100644 --- a/lib/src/downloader.dart +++ b/lib/src/downloader.dart @@ -1,3 +1,4 @@ +// In some cases, it's hard to get around calls on 'dynamic'. // ignore_for_file: avoid_dynamic_calls import 'dart:async'; @@ -438,6 +439,7 @@ class FlutterDownloader { /// Prints [message] to console if [_debug] is true. static void _log(String? message) { if (_debug) { + // Using print here seeems good enough. // ignore: avoid_print print(message); } diff --git a/pubspec.yaml b/pubspec.yaml index 92291843..d66e4095 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,8 +15,8 @@ flutter: pluginClass: FlutterDownloaderPlugin environment: - sdk: ">=3.3.0 <4.0.0" - flutter: ">=3.19.0" + sdk: ">=3.6.0 <4.0.0" + flutter: ">=3.27.0" dependencies: flutter: @@ -25,4 +25,4 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - leancode_lint: ^12.1.0 + leancode_lint: ^15.0.0