From f6a77cf6fbb515f01aa9fb459b2ee739de3e724c Mon Sep 17 00:00:00 2001 From: Jakub Date: Sun, 5 Jun 2022 15:41:34 +0200 Subject: [PATCH] Feature/flutter 3.0 (#1023) * Flutter 3.0 update * Updated version * General refactor --- CHANGELOG.md | 4 ++ android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- docs/install.md | 2 +- example/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/ios/Runner.xcodeproj/project.pbxproj | 14 +++---- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- example/ios/Runner/Info.plist | 2 + example/pubspec.yaml | 6 +-- lib/src/core/better_player.dart | 4 +- lib/src/subtitles/better_player_subtitle.dart | 6 +-- pubspec.lock | 41 ++++++++----------- pubspec.yaml | 16 ++++---- 14 files changed, 50 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c2cf3a80b..86864b975 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.0.83 +* Updated dependencies +* Fixed Flutter 3.0 issues + ## 0.0.82 * Updated ExoPlayer version to 2.17.1. * Updated dependencies. diff --git a/android/build.gradle b/android/build.gradle index 79f606b82..40d3f6b57 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { ext.annotationVersion = "1.2.0" ext.workVersion = "2.7.0" ext.coreVersion = "1.6.0" - ext.gradleVersion = "4.1.0" + ext.gradleVersion = "7.0.2" ext.kotlinVersion = "1.5.31" repositories { diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index da9702f9e..29e413457 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/docs/install.md b/docs/install.md index b0d086ca9..cfe123190 100644 --- a/docs/install.md +++ b/docs/install.md @@ -4,7 +4,7 @@ ```yaml dependencies: - better_player: ^0.0.82 + better_player: ^0.0.83 ``` 2. Install it diff --git a/example/android/build.gradle b/example/android/build.gradle index ab194ad56..7c1aad732 100644 --- a/example/android/build.gradle +++ b/example/android/build.gradle @@ -1,6 +1,6 @@ buildscript { ext.kotlinVersion = "1.5.31" - ext.gradleVersion = "4.1.0" + ext.gradleVersion = "7.0.2" ext.multidexVersion = "2.0.1" repositories { google() diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties index 3fcc9eb32..c3c8c1027 100644 --- a/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/android/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 96287bf1b..6e6bf2d5a 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ @@ -163,7 +163,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = "The Chromium Authors"; TargetAttributes = { 97C146ED1CF9000F007C117D = { @@ -270,7 +270,7 @@ "${BUILT_PRODUCTS_DIR}/PINCache/PINCache.framework", "${BUILT_PRODUCTS_DIR}/PINOperation/PINOperation.framework", "${BUILT_PRODUCTS_DIR}/better_player/better_player.framework", - "${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework", + "${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework", "${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework", ); name = "[CP] Embed Pods Frameworks"; @@ -281,7 +281,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINCache.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PINOperation.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/better_player.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework", ); runOnlyForDeploymentPostprocessing = 0; @@ -395,7 +395,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.jhomlala.betterplayer; + PRODUCT_BUNDLE_IDENTIFIER = com.jhomlala.betterplayer2; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -532,7 +532,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.jhomlala.betterplayer; + PRODUCT_BUNDLE_IDENTIFIER = com.jhomlala.betterplayer2; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; @@ -564,7 +564,7 @@ "$(inherited)", "$(PROJECT_DIR)/Flutter", ); - PRODUCT_BUNDLE_IDENTIFIER = com.jhomlala.betterplayer; + PRODUCT_BUNDLE_IDENTIFIER = com.jhomlala.betterplayer2; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cfd..3db53b6e1 100644 --- a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ + CADisableMinimumFrameDurationOnPhone + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleExecutable diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 75b688bcf..6bd4dcdf8 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -13,9 +13,9 @@ dependencies: sdk: flutter flutter_localizations: sdk: flutter - path_provider: ^2.0.9 - visibility_detector: ^0.2.2 - collection: ^1.15.0 + path_provider: ^2.0.10 + visibility_detector: ^0.3.3 + collection: ^1.16.0 dev_dependencies: flutter_test: diff --git a/lib/src/core/better_player.dart b/lib/src/core/better_player.dart index 0e0e57d74..5396a9568 100644 --- a/lib/src/core/better_player.dart +++ b/lib/src/core/better_player.dart @@ -63,7 +63,7 @@ class _BetterPlayerState extends State @override void initState() { super.initState(); - WidgetsBinding.instance!.addObserver(this); + WidgetsBinding.instance.addObserver(this); } @override @@ -110,7 +110,7 @@ class _BetterPlayerState extends State _betterPlayerConfiguration.deviceOrientationsAfterFullScreen); } - WidgetsBinding.instance!.removeObserver(this); + WidgetsBinding.instance.removeObserver(this); _controllerEventSubscription?.cancel(); widget.controller.dispose(); VisibilityDetectorController.instance diff --git a/lib/src/subtitles/better_player_subtitle.dart b/lib/src/subtitles/better_player_subtitle.dart index c938fe6fe..00955abca 100644 --- a/lib/src/subtitles/better_player_subtitle.dart +++ b/lib/src/subtitles/better_player_subtitle.dart @@ -7,15 +7,11 @@ class BetterPlayerSubtitle { final Duration? end; final List? texts; - ///VTT OR SRT - final String? type; - BetterPlayerSubtitle._({ this.index, this.start, this.end, this.texts, - this.type, }); factory BetterPlayerSubtitle(String value, bool isWebVTT) { @@ -114,6 +110,6 @@ class BetterPlayerSubtitle { @override String toString() { - return 'BetterPlayerSubtitle{index: $index, start: $start, end: $end, texts: $texts, type: $type}'; + return 'BetterPlayerSubtitle{index: $index, start: $start, end: $end, texts: $texts}'; } } diff --git a/pubspec.lock b/pubspec.lock index 89edea80e..7d19ee3d7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,7 +42,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" csslib: dependency: transitive description: @@ -56,14 +56,14 @@ packages: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" ffi: dependency: transitive description: @@ -104,7 +104,7 @@ packages: name: flutter_widget_from_html_core url: "https://pub.dartlang.org" source: hosted - version: "0.8.5+1" + version: "0.8.5+3" fwfh_text_style: dependency: transitive description: @@ -132,14 +132,14 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" lint: dependency: "direct dev" description: name: lint url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" matcher: dependency: transitive description: @@ -153,7 +153,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: "direct main" description: @@ -167,14 +167,14 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" path_provider: dependency: "direct main" description: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.10" path_provider_android: dependency: transitive description: @@ -223,7 +223,7 @@ packages: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "5.0.0" platform: dependency: transitive description: @@ -256,7 +256,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -291,28 +291,21 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.0" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" visibility_detector: dependency: "direct main" description: name: visibility_detector url: "https://pub.dartlang.org" source: hosted - version: "0.2.2" + version: "0.3.3" wakelock: dependency: "direct main" description: @@ -368,7 +361,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.3.1" + version: "6.1.0" sdks: - dart: ">=2.15.0-7.0.dev <3.0.0" - flutter: ">=2.6.0-0" + dart: ">=2.17.0 <3.0.0" + flutter: ">=2.12.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6a43d2e65..ebfe24469 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: better_player description: Advanced video player based on video_player and Chewie. It's solves many typical use cases and it's easy to run. -version: 0.0.82 +version: 0.0.83 # Disabled because of warning from analyzer # authors: # - Jakub Homlala @@ -14,17 +14,17 @@ environment: dependencies: flutter: sdk: flutter - cupertino_icons: ^1.0.4 + cupertino_icons: ^1.0.5 wakelock: ^0.6.1+2 meta: ^1.7.0 - flutter_widget_from_html_core: ^0.8.5+1 - visibility_detector: ^0.2.2 - path_provider: ^2.0.9 - collection: ^1.15.0 - xml: ^5.3.0 + flutter_widget_from_html_core: ^0.8.5+3 + visibility_detector: ^0.3.3 + path_provider: ^2.0.10 + collection: ^1.16.0 + xml: ^6.1.0 dev_dependencies: - lint: ^1.8.1 + lint: ^1.8.2 flutter_test: sdk: flutter flutter_localizations: