From a3a08efe2c80c8a5b6ae9e59cd0dc7c70f858dd6 Mon Sep 17 00:00:00 2001 From: jesswrd Date: Mon, 9 Feb 2026 18:48:24 -0800 Subject: [PATCH] this change works for both --- .../example/android/app/build.gradle | 10 +++++---- .../example/android/gradle.properties | 1 + .../example/android/settings.gradle | 12 ++++++++++ .../video_player/video_player/pubspec.yaml | 3 ++- .../video_player_android/android/build.gradle | 22 ++++++++++++++----- 5 files changed, 38 insertions(+), 10 deletions(-) diff --git a/packages/video_player/video_player/example/android/app/build.gradle b/packages/video_player/video_player/example/android/app/build.gradle index 5a8787bcc93a..4619c7958b1c 100644 --- a/packages/video_player/video_player/example/android/app/build.gradle +++ b/packages/video_player/video_player/example/android/app/build.gradle @@ -1,9 +1,11 @@ -plugins { - id "com.android.application" - id "org.jetbrains.kotlin.android" - id "dev.flutter.flutter-gradle-plugin" +apply plugin: "com.android.application" + +if (!gradle.hasProperty('capturedAgpVersion') || gradle.capturedAgpVersion != "9.0.0") { + apply plugin: "org.jetbrains.kotlin.android" } +apply plugin: "dev.flutter.flutter-gradle-plugin" + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { diff --git a/packages/video_player/video_player/example/android/gradle.properties b/packages/video_player/video_player/example/android/gradle.properties index da87b2c8f892..e6be7287983d 100644 --- a/packages/video_player/video_player/example/android/gradle.properties +++ b/packages/video_player/video_player/example/android/gradle.properties @@ -1,2 +1,3 @@ org.gradle.jvmargs=-Xmx4G android.useAndroidX=true +android.newDsl=false diff --git a/packages/video_player/video_player/example/android/settings.gradle b/packages/video_player/video_player/example/android/settings.gradle index 96fce46479f8..1a1a0413f716 100644 --- a/packages/video_player/video_player/example/android/settings.gradle +++ b/packages/video_player/video_player/example/android/settings.gradle @@ -14,6 +14,18 @@ pluginManagement { mavenCentral() gradlePluginPortal() } + + resolutionStrategy { + eachPlugin { + if (requested.id.id == "com.android.application" && requested.id.id != null) { + gradle.ext.capturedAgpVersion = requested.version + println "====================================================" + println "At the flutter app project-level settings.gradle file." + println "AGP version from settings: $gradle.capturedAgpVersion" + println "====================================================" + } + } + } } // See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info. diff --git a/packages/video_player/video_player/pubspec.yaml b/packages/video_player/video_player/pubspec.yaml index a71e45323394..16d89cfe16fc 100644 --- a/packages/video_player/video_player/pubspec.yaml +++ b/packages/video_player/video_player/pubspec.yaml @@ -25,7 +25,8 @@ dependencies: flutter: sdk: flutter html: ^0.15.0 - video_player_android: ^2.8.1 + video_player_android: + path: /Users/jesswon/work/packages/packages/video_player/video_player_android video_player_avfoundation: ^2.7.0 video_player_platform_interface: ^6.3.0 video_player_web: ^2.1.0 diff --git a/packages/video_player/video_player_android/android/build.gradle b/packages/video_player/video_player_android/android/build.gradle index 6e2cfb221bf6..a0f6d83615fa 100644 --- a/packages/video_player/video_player_android/android/build.gradle +++ b/packages/video_player/video_player_android/android/build.gradle @@ -20,9 +20,16 @@ rootProject.allprojects { mavenCentral() } } - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' +println "====================================================" +println "At the library-level build.gradle file." +println "AGP version from settings: $gradle.capturedAgpVersion" +println "====================================================" +if (gradle.capturedAgpVersion == "9.0.0") { + apply plugin: 'com.android.library' +} else { + apply plugin: 'com.android.library' + apply plugin: 'kotlin-android' +} android { namespace = "io.flutter.plugins.videoplayer" @@ -42,8 +49,13 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() +// kotlinOptions { +// jvmTarget = JavaVersion.VERSION_17.toString() +// } + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } } sourceSets {