diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index 8057a422..5b2614d3 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 33 + compileSdkVersion 34 sourceSets { main.java.srcDirs += 'src/main/kotlin' diff --git a/example/android/build.gradle b/example/android/build.gradle index 6df3db16..87d1a274 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '2.0.0' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -26,6 +26,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 297f2fec..966aa8e6 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip diff --git a/example/lib/main.dart b/example/lib/main.dart index ca4874c8..06afe27b 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -177,8 +177,8 @@ class _VideoEditorState extends State { @override Widget build(BuildContext context) { - return WillPopScope( - onWillPop: () async => false, + return PopScope( + canPop: false, child: Scaffold( backgroundColor: Colors.black, body: _controller.initialized @@ -238,12 +238,12 @@ class _VideoEditorState extends State { margin: const EdgeInsets.only(top: 10), child: Column( children: [ - TabBar( + const TabBar( tabs: [ Row( mainAxisAlignment: MainAxisAlignment.center, - children: const [ + children: [ Padding( padding: EdgeInsets.all(5), child: Icon( @@ -253,7 +253,7 @@ class _VideoEditorState extends State { Row( mainAxisAlignment: MainAxisAlignment.center, - children: const [ + children: [ Padding( padding: EdgeInsets.all(5), child: diff --git a/lib/src/widgets/cover/cover_selection.dart b/lib/src/widgets/cover/cover_selection.dart index 89cb2d64..dbff1753 100644 --- a/lib/src/widgets/cover/cover_selection.dart +++ b/lib/src/widgets/cover/cover_selection.dart @@ -114,7 +114,7 @@ class _CoverSelectionState extends State @override Widget build(BuildContext context) { super.build(context); - final wrap = widget.wrap ?? Wrap(); + final wrap = widget.wrap ?? const Wrap(); return StreamBuilder>( stream: _stream,