Skip to content

[WIP] AGP 9 Ecosystem Playground #10990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jesswrd wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[WIP] AGP 9 Ecosystem Playground #10990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions packages/video_player/video_player/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()) {
Expand Down
1 change: 1 addition & 0 deletions packages/video_player/video_player/example/android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
org.gradle.jvmargs=-Xmx4G
android.useAndroidX=true
android.newDsl=false
12 changes: 12 additions & 0 deletions packages/video_player/video_player/example/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion packages/video_player/video_player/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 17 additions & 5 deletions packages/video_player/video_player_android/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down
Loading