File tree Expand file tree Collapse file tree 8 files changed +24
-18
lines changed
camera/camera_android_camerax
video_player_android/android Expand file tree Collapse file tree 8 files changed +24
-18
lines changed Original file line number Diff line number Diff line change @@ -22,21 +22,22 @@ rootProject.allprojects {
2222}
2323
2424apply plugin : ' com.android.library'
25- apply plugin : ' kotlin-android'
25+ // apply plugin: 'kotlin-android'
2626
2727android {
2828 namespace = " io.flutter.plugins.camerax"
2929 // CameraX dependencies require compilation against version 33 or later.
30- compileSdk = flutter . compileSdkVersion
30+ compileSdk = 36
3131
3232 compileOptions {
3333 sourceCompatibility = JavaVersion . VERSION_17
3434 targetCompatibility = JavaVersion . VERSION_17
3535 }
3636
37- kotlinOptions {
38- // This must match the Java version provided in compileOptions.
39- jvmTarget = JavaVersion . VERSION_17 . toString()
37+ kotlin {
38+ compilerOptions {
39+ jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget . JVM_17
40+ }
4041 }
4142
4243 defaultConfig {
Original file line number Diff line number Diff line change 11plugins {
22 id " com.android.application"
3- id " org.jetbrains.kotlin.android"
43 id " dev.flutter.flutter-gradle-plugin"
54}
65
@@ -24,17 +23,18 @@ if (flutterVersionName == null) {
2423
2524android {
2625 namespace = " io.flutter.plugins.cameraxexample"
27- compileSdk = flutter . compileSdkVersion
26+ compileSdk = 36
2827 ndkVersion = flutter. ndkVersion
2928
3029 compileOptions {
3130 sourceCompatibility = JavaVersion . VERSION_17
3231 targetCompatibility = JavaVersion . VERSION_17
3332 }
3433
35- kotlinOptions {
36- // This must match the Java version provided in compileOptions.
37- jvmTarget = JavaVersion . VERSION_17 . toString()
34+ kotlin {
35+ compilerOptions {
36+ jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget . JVM_17
37+ }
3838 }
3939
4040 defaultConfig {
Original file line number Diff line number Diff line change 11org.gradle.jvmargs =-Xmx4G
22android.useAndroidX =true
3+ android.newDsl =false
Original file line number Diff line number Diff line change @@ -2,5 +2,5 @@ distributionBase=GRADLE_USER_HOME
22distributionPath =wrapper/dists
33zipStoreBase =GRADLE_USER_HOME
44zipStorePath =wrapper/dists
5- distributionUrl =https\://services.gradle.org/distributions/gradle-8.13 -all.zip
5+ distributionUrl =https\://services.gradle.org/distributions/gradle-9.1.0 -all.zip
66
Original file line number Diff line number Diff line change @@ -19,8 +19,8 @@ pluginManagement {
1919// See https://github.com/flutter/flutter/blob/master/docs/ecosystem/Plugins-and-Packages-repository-structure.md#gradle-structure for more info.
2020plugins {
2121 id " dev.flutter.flutter-plugin-loader" version " 1.0.0"
22- id " com.android.application" version " 8.11 .0" apply false
23- id " org.jetbrains.kotlin.android" version " 2.2.0" apply false
22+ id " com.android.application" version " 9.0 .0" apply false
23+ // id "org.jetbrains.kotlin.android" version "2.2.0" apply false
2424 id " com.google.cloud.artifactregistry.gradle-plugin" version " 2.2.1"
2525}
2626
Original file line number Diff line number Diff line change @@ -17,7 +17,8 @@ dependencies:
1717 camera_platform_interface : ^2.6.0
1818 flutter :
1919 sdk : flutter
20- video_player : ^2.7.0
20+ video_player :
21+ path : /Users/jesswon/work/packages/packages/video_player/video_player
2122
2223dev_dependencies :
2324 espresso : ^0.4.0
Original file line number Diff line number Diff line change @@ -25,7 +25,8 @@ dependencies:
2525 flutter :
2626 sdk : flutter
2727 html : ^0.15.0
28- video_player_android : ^2.8.1
28+ video_player_android :
29+ path : /Users/jesswon/work/packages/packages/video_player/video_player_android
2930 video_player_avfoundation : ^2.7.0
3031 video_player_platform_interface : ^6.3.0
3132 video_player_web : ^2.1.0
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ rootProject.allprojects {
2222}
2323
2424apply plugin : ' com.android.library'
25- apply plugin : ' kotlin-android'
25+ // apply plugin: 'kotlin-android'
2626
2727android {
2828 namespace = " io.flutter.plugins.videoplayer"
@@ -41,8 +41,10 @@ android {
4141 sourceCompatibility = JavaVersion . VERSION_17
4242 targetCompatibility = JavaVersion . VERSION_17
4343 }
44- kotlinOptions {
45- jvmTarget = JavaVersion . VERSION_17 . toString()
44+ kotlin {
45+ compilerOptions {
46+ jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget . JVM_17
47+ }
4648 }
4749
4850 sourceSets {
You can’t perform that action at this time.
0 commit comments