From bf00ddc2f9af20018219baf077576b4d38da128f Mon Sep 17 00:00:00 2001 From: kind Date: Thu, 4 Dec 2025 15:40:09 +0800 Subject: [PATCH 1/8] Update Android SDK to 35 (Android 15) and Flutter SDK to 3.29.3. --- example/android/app/build.gradle | 17 +++++++++---- example/android/build.gradle | 20 +++++++-------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/android/settings.gradle | 25 +++++++++++++++++++ example/pubspec.yaml | 2 +- pubspec.yaml | 4 +-- 6 files changed, 51 insertions(+), 19 deletions(-) diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 2c8afc52..4e8149de 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') @@ -22,16 +28,17 @@ if (flutterVersionName == null) { flutterVersionName = '1.0' } -apply plugin: 'com.android.application' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" +//apply plugin: 'com.android.application' +//apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 35 + namespace "com.befovy.fijkplayer.demo" defaultConfig { applicationId "com.befovy.fijkplayer.demo" - minSdkVersion 16 - targetSdkVersion 33 + minSdkVersion flutter.minSdkVersion + targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/example/android/build.gradle b/example/android/build.gradle index db3128c0..dab129f0 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,13 +1,13 @@ -buildscript { - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' - } -} +//buildscript { +// repositories { +// google() +// mavenCentral() +// } +// +// dependencies { +// classpath 'com.android.tools.build:gradle:4.1.3' +// } +//} allprojects { repositories { diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 78a16986..516a3986 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-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 81a768e3..2e6ed6b9 100644 --- a/example/android/settings.gradle +++ b/example/android/settings.gradle @@ -1,3 +1,28 @@ + +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" // apply true + id "com.android.application" version "8.7.0" apply false + id "org.jetbrains.kotlin.android" version "1.8.10" apply false +} + rootProject.name = 'fijkplayer-android' include ':app' diff --git a/example/pubspec.yaml b/example/pubspec.yaml index f586f80b..80be4a49 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -3,7 +3,7 @@ description: Demonstrates how to use the fijkplayer plugin. publish_to: 'none' version: 0.8.5 environment: - sdk: '>=2.12.0 <3.0.0' + sdk: ">=2.17.0 <4.0.0" dependencies: flutter: diff --git a/pubspec.yaml b/pubspec.yaml index 19c99b7c..1f06e77b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -6,8 +6,8 @@ repository: https://github.com/befovy/fijkplayer issue_tracker: https://github.com/befovy/fijkplayer/issues environment: - sdk: ">=2.14.0 <4.0.0" - flutter: ">=1.12.0" + sdk: ">=2.17.0 <4.0.0" + flutter: ">=3.0.0" dependencies: flutter: From 81e6124015a77e9a7de98bfbc97f452692e4afe4 Mon Sep 17 00:00:00 2001 From: kind Date: Fri, 5 Dec 2025 09:06:02 +0800 Subject: [PATCH 2/8] Update Flutter SDK to 3.27.4. --- android/build.gradle | 6 +++--- android/gradle/wrapper/gradle-wrapper.properties | 2 +- android/src/main/AndroidManifest.xml | 2 +- example/android/app/build.gradle | 1 + example/android/app/src/main/AndroidManifest.xml | 3 +-- example/android/build.gradle | 1 + example/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index aca8e7f4..4f7f9cd7 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -4,10 +4,10 @@ version '0.11.0' apply plugin: 'com.android.library' android { - compileSdkVersion 30 - + compileSdkVersion 35 + namespace "com.befovy.fijkplayer" defaultConfig { - minSdkVersion 16 + minSdkVersion flutter.minSdkVersion testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 8f779b43..a445af74 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 27920a61..c4e83de3 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,3 +1,3 @@ - + diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 4e8149de..fcb096c0 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -48,6 +48,7 @@ android { noCompress '.flv', '.mp4' } + buildTypes { release { // Signing with the debug keys for now, so `flutter run --release` works. diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml index 0943f564..ebf47111 100644 --- a/example/android/app/src/main/AndroidManifest.xml +++ b/example/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ + xmlns:tools="http://schemas.android.com/tools">