From 69e5a098a93b91dbca3d61e4f90a93c5c89f2ad2 Mon Sep 17 00:00:00 2001 From: Shinya Kumagai Date: Sun, 3 Mar 2024 19:32:45 +0900 Subject: [PATCH 1/3] Updates minimum supported SDK version to Flutter 3.10/Dart 3 --- flutter_custom_tabs/example/ios/Podfile.lock | 2 +- flutter_custom_tabs/example/pubspec.yaml | 4 ++-- flutter_custom_tabs/pubspec.yaml | 4 ++-- .../example/android/app/build.gradle | 6 ++---- flutter_custom_tabs_android/example/pubspec.yaml | 4 ++-- flutter_custom_tabs_android/pubspec.yaml | 4 ++-- flutter_custom_tabs_ios/example/pubspec.yaml | 4 ++-- flutter_custom_tabs_ios/pubspec.yaml | 4 ++-- flutter_custom_tabs_platform_interface/lib/src/types.dart | 2 +- flutter_custom_tabs_platform_interface/pubspec.yaml | 4 ++-- flutter_custom_tabs_web/example/pubspec.yaml | 4 ++-- flutter_custom_tabs_web/pubspec.yaml | 4 ++-- 12 files changed, 22 insertions(+), 24 deletions(-) diff --git a/flutter_custom_tabs/example/ios/Podfile.lock b/flutter_custom_tabs/example/ios/Podfile.lock index 76092d7..d11ceb0 100644 --- a/flutter_custom_tabs/example/ios/Podfile.lock +++ b/flutter_custom_tabs/example/ios/Podfile.lock @@ -15,7 +15,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 - flutter_custom_tabs_ios: 62439c843b2691aae516fd50119a01eb9755fff7 + flutter_custom_tabs_ios: a651b18786388923b62de8c0537607de87c2eccf PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d diff --git a/flutter_custom_tabs/example/pubspec.yaml b/flutter_custom_tabs/example/pubspec.yaml index 10e06bd..9b03258 100644 --- a/flutter_custom_tabs/example/pubspec.yaml +++ b/flutter_custom_tabs/example/pubspec.yaml @@ -4,8 +4,8 @@ description: Demonstrates how to use the flutter_custom_tabs plugin. publish_to: none environment: - sdk: ">=2.17.0 <4.0.0" - flutter: ">=3.0.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" dependencies: flutter: diff --git a/flutter_custom_tabs/pubspec.yaml b/flutter_custom_tabs/pubspec.yaml index 311c695..19ee00e 100644 --- a/flutter_custom_tabs/pubspec.yaml +++ b/flutter_custom_tabs/pubspec.yaml @@ -5,8 +5,8 @@ repository: https://github.com/droibit/flutter_custom_tabs/tree/main/flutter_cus publish_to: none environment: - sdk: ">=2.17.0 <4.0.0" - flutter: ">=3.0.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" dependencies: flutter: diff --git a/flutter_custom_tabs_android/example/android/app/build.gradle b/flutter_custom_tabs_android/example/android/app/build.gradle index a642f0c..5b6b25c 100644 --- a/flutter_custom_tabs_android/example/android/app/build.gradle +++ b/flutter_custom_tabs_android/example/android/app/build.gradle @@ -32,11 +32,9 @@ android { } defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.github.droibit.plugins.flutter.customtabs.flutter_custom_tabs_android_example" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdk flutter.minSdkVersion + // Enable multidex support. + minSdk 21 //flutter.minSdkVersion targetSdk flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName diff --git a/flutter_custom_tabs_android/example/pubspec.yaml b/flutter_custom_tabs_android/example/pubspec.yaml index 2a3ae1c..8c222e9 100644 --- a/flutter_custom_tabs_android/example/pubspec.yaml +++ b/flutter_custom_tabs_android/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the flutter_custom_tabs_android plugin. publish_to: 'none' environment: - sdk: ">=2.17.0 <4.0.0" - flutter: ">=3.0.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" dependencies: flutter: diff --git a/flutter_custom_tabs_android/pubspec.yaml b/flutter_custom_tabs_android/pubspec.yaml index 24d91ab..7569ce4 100644 --- a/flutter_custom_tabs_android/pubspec.yaml +++ b/flutter_custom_tabs_android/pubspec.yaml @@ -5,8 +5,8 @@ repository: https://github.com/droibit/flutter_custom_tabs/tree/main/flutter_cus publish_to: none environment: - sdk: '>=2.17.0 <4.0.0' - flutter: '>=3.0.0' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' flutter: plugin: diff --git a/flutter_custom_tabs_ios/example/pubspec.yaml b/flutter_custom_tabs_ios/example/pubspec.yaml index dfcdfa9..1070fc1 100644 --- a/flutter_custom_tabs_ios/example/pubspec.yaml +++ b/flutter_custom_tabs_ios/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the flutter_custom_tabs_ios plugin. publish_to: 'none' environment: - sdk: ">=2.17.0 <4.0.0" - flutter: ">=3.0.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" dependencies: flutter: diff --git a/flutter_custom_tabs_ios/pubspec.yaml b/flutter_custom_tabs_ios/pubspec.yaml index 1b471d3..64584b1 100644 --- a/flutter_custom_tabs_ios/pubspec.yaml +++ b/flutter_custom_tabs_ios/pubspec.yaml @@ -5,8 +5,8 @@ repository: https://github.com/droibit/flutter_custom_tabs/tree/main/flutter_cus publish_to: none environment: - sdk: '>=2.17.0 <4.0.0' - flutter: '>=3.0.0' + sdk: '>=3.0.0 <4.0.0' + flutter: '>=3.10.0' dependencies: flutter: diff --git a/flutter_custom_tabs_platform_interface/lib/src/types.dart b/flutter_custom_tabs_platform_interface/lib/src/types.dart index 2c8011d..e59a295 100644 --- a/flutter_custom_tabs_platform_interface/lib/src/types.dart +++ b/flutter_custom_tabs_platform_interface/lib/src/types.dart @@ -6,4 +6,4 @@ import 'package:meta/meta.dart'; /// this class. /// @immutable -class PlatformOptions {} +interface class PlatformOptions {} diff --git a/flutter_custom_tabs_platform_interface/pubspec.yaml b/flutter_custom_tabs_platform_interface/pubspec.yaml index 0276acb..6810db6 100644 --- a/flutter_custom_tabs_platform_interface/pubspec.yaml +++ b/flutter_custom_tabs_platform_interface/pubspec.yaml @@ -4,8 +4,8 @@ version: 2.0.0 repository: https://github.com/droibit/flutter_custom_tabs/tree/main/flutter_custom_tabs_platform_interface environment: - sdk: ">=2.17.0 <4.0.0" - flutter: ">=3.0.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" dependencies: flutter: diff --git a/flutter_custom_tabs_web/example/pubspec.yaml b/flutter_custom_tabs_web/example/pubspec.yaml index ab41a73..8920c8c 100644 --- a/flutter_custom_tabs_web/example/pubspec.yaml +++ b/flutter_custom_tabs_web/example/pubspec.yaml @@ -2,8 +2,8 @@ name: regular_integration_tests publish_to: none environment: - sdk: ">=2.17.0 <4.0.0" - flutter: ">=3.0.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" dependencies: flutter: diff --git a/flutter_custom_tabs_web/pubspec.yaml b/flutter_custom_tabs_web/pubspec.yaml index b3cba75..3b94d25 100644 --- a/flutter_custom_tabs_web/pubspec.yaml +++ b/flutter_custom_tabs_web/pubspec.yaml @@ -5,8 +5,8 @@ repository: https://github.com/droibit/flutter_custom_tabs/tree/main/flutter_cus publish_to: none environment: - sdk: ">=2.17.0 <4.0.0" - flutter: ">=3.0.0" + sdk: ">=3.0.0 <4.0.0" + flutter: ">=3.10.0" flutter: plugin: From 8d42559ff1a77c80496f89f18703e26a77a6d4ce Mon Sep 17 00:00:00 2001 From: Shinya Kumagai Date: Sun, 3 Mar 2024 19:35:48 +0900 Subject: [PATCH 2/3] Upgrade pigeon to v17.0.0 --- .../flutter/plugins/customtabs/Messages.java | 40 ++++++++++++++++++- .../lib/src/messages/messages.g.dart | 2 +- flutter_custom_tabs_android/pubspec.yaml | 2 +- .../ios/Classes/messages.g.swift | 33 +++++++-------- .../lib/src/messages/messages.g.dart | 2 +- flutter_custom_tabs_ios/pubspec.yaml | 2 +- 6 files changed, 60 insertions(+), 21 deletions(-) diff --git a/flutter_custom_tabs_android/android/src/main/java/com/github/droibit/flutter/plugins/customtabs/Messages.java b/flutter_custom_tabs_android/android/src/main/java/com/github/droibit/flutter/plugins/customtabs/Messages.java index ebc9c72..48da646 100644 --- a/flutter_custom_tabs_android/android/src/main/java/com/github/droibit/flutter/plugins/customtabs/Messages.java +++ b/flutter_custom_tabs_android/android/src/main/java/com/github/droibit/flutter/plugins/customtabs/Messages.java @@ -1,8 +1,11 @@ -// Autogenerated from Pigeon (v14.0.0), do not edit directly. +// Autogenerated from Pigeon (v17.1.1), do not edit directly. // See also: https://pub.dev/packages/pigeon package com.github.droibit.flutter.plugins.customtabs; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.CLASS; + import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -11,6 +14,8 @@ import io.flutter.plugin.common.MessageCodec; import io.flutter.plugin.common.StandardMessageCodec; import java.io.ByteArrayOutputStream; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; @@ -57,6 +62,10 @@ protected static ArrayList wrapError(@NonNull Throwable exception) { return errorList; } + @Target(METHOD) + @Retention(CLASS) + @interface CanIgnoreReturnValue {} + /** Generated class from Pigeon that represents data sent in messages. */ public static final class CustomTabsIntentOptions { private @Nullable ColorSchemes colorSchemes; @@ -153,6 +162,7 @@ public static final class Builder { private @Nullable ColorSchemes colorSchemes; + @CanIgnoreReturnValue public @NonNull Builder setColorSchemes(@Nullable ColorSchemes setterArg) { this.colorSchemes = setterArg; return this; @@ -160,6 +170,7 @@ public static final class Builder { private @Nullable Boolean urlBarHidingEnabled; + @CanIgnoreReturnValue public @NonNull Builder setUrlBarHidingEnabled(@Nullable Boolean setterArg) { this.urlBarHidingEnabled = setterArg; return this; @@ -167,6 +178,7 @@ public static final class Builder { private @Nullable Long shareState; + @CanIgnoreReturnValue public @NonNull Builder setShareState(@Nullable Long setterArg) { this.shareState = setterArg; return this; @@ -174,6 +186,7 @@ public static final class Builder { private @Nullable Boolean showTitle; + @CanIgnoreReturnValue public @NonNull Builder setShowTitle(@Nullable Boolean setterArg) { this.showTitle = setterArg; return this; @@ -181,6 +194,7 @@ public static final class Builder { private @Nullable Boolean instantAppsEnabled; + @CanIgnoreReturnValue public @NonNull Builder setInstantAppsEnabled(@Nullable Boolean setterArg) { this.instantAppsEnabled = setterArg; return this; @@ -188,6 +202,7 @@ public static final class Builder { private @Nullable CloseButton closeButton; + @CanIgnoreReturnValue public @NonNull Builder setCloseButton(@Nullable CloseButton setterArg) { this.closeButton = setterArg; return this; @@ -195,6 +210,7 @@ public static final class Builder { private @Nullable Animations animations; + @CanIgnoreReturnValue public @NonNull Builder setAnimations(@Nullable Animations setterArg) { this.animations = setterArg; return this; @@ -202,6 +218,7 @@ public static final class Builder { private @Nullable BrowserConfiguration browser; + @CanIgnoreReturnValue public @NonNull Builder setBrowser(@Nullable BrowserConfiguration setterArg) { this.browser = setterArg; return this; @@ -209,6 +226,7 @@ public static final class Builder { private @Nullable PartialConfiguration partial; + @CanIgnoreReturnValue public @NonNull Builder setPartial(@Nullable PartialConfiguration setterArg) { this.partial = setterArg; return this; @@ -314,6 +332,7 @@ public static final class Builder { private @Nullable String startEnter; + @CanIgnoreReturnValue public @NonNull Builder setStartEnter(@Nullable String setterArg) { this.startEnter = setterArg; return this; @@ -321,6 +340,7 @@ public static final class Builder { private @Nullable String startExit; + @CanIgnoreReturnValue public @NonNull Builder setStartExit(@Nullable String setterArg) { this.startExit = setterArg; return this; @@ -328,6 +348,7 @@ public static final class Builder { private @Nullable String endEnter; + @CanIgnoreReturnValue public @NonNull Builder setEndEnter(@Nullable String setterArg) { this.endEnter = setterArg; return this; @@ -335,6 +356,7 @@ public static final class Builder { private @Nullable String endExit; + @CanIgnoreReturnValue public @NonNull Builder setEndExit(@Nullable String setterArg) { this.endExit = setterArg; return this; @@ -426,6 +448,7 @@ public static final class Builder { private @Nullable Boolean prefersExternalBrowser; + @CanIgnoreReturnValue public @NonNull Builder setPrefersExternalBrowser(@NonNull Boolean setterArg) { this.prefersExternalBrowser = setterArg; return this; @@ -433,6 +456,7 @@ public static final class Builder { private @Nullable Boolean prefersDefaultBrowser; + @CanIgnoreReturnValue public @NonNull Builder setPrefersDefaultBrowser(@Nullable Boolean setterArg) { this.prefersDefaultBrowser = setterArg; return this; @@ -440,6 +464,7 @@ public static final class Builder { private @Nullable List fallbackCustomTabs; + @CanIgnoreReturnValue public @NonNull Builder setFallbackCustomTabs(@Nullable List setterArg) { this.fallbackCustomTabs = setterArg; return this; @@ -447,6 +472,7 @@ public static final class Builder { private @Nullable Map headers; + @CanIgnoreReturnValue public @NonNull Builder setHeaders(@Nullable Map setterArg) { this.headers = setterArg; return this; @@ -512,6 +538,7 @@ public static final class Builder { private @Nullable String icon; + @CanIgnoreReturnValue public @NonNull Builder setIcon(@Nullable String setterArg) { this.icon = setterArg; return this; @@ -519,6 +546,7 @@ public static final class Builder { private @Nullable Long position; + @CanIgnoreReturnValue public @NonNull Builder setPosition(@Nullable Long setterArg) { this.position = setterArg; return this; @@ -596,6 +624,7 @@ public static final class Builder { private @Nullable Long colorScheme; + @CanIgnoreReturnValue public @NonNull Builder setColorScheme(@Nullable Long setterArg) { this.colorScheme = setterArg; return this; @@ -603,6 +632,7 @@ public static final class Builder { private @Nullable ColorSchemeParams lightParams; + @CanIgnoreReturnValue public @NonNull Builder setLightParams(@Nullable ColorSchemeParams setterArg) { this.lightParams = setterArg; return this; @@ -610,6 +640,7 @@ public static final class Builder { private @Nullable ColorSchemeParams darkParams; + @CanIgnoreReturnValue public @NonNull Builder setDarkParams(@Nullable ColorSchemeParams setterArg) { this.darkParams = setterArg; return this; @@ -617,6 +648,7 @@ public static final class Builder { private @Nullable ColorSchemeParams defaultPrams; + @CanIgnoreReturnValue public @NonNull Builder setDefaultPrams(@Nullable ColorSchemeParams setterArg) { this.defaultPrams = setterArg; return this; @@ -692,6 +724,7 @@ public static final class Builder { private @Nullable Long toolbarColor; + @CanIgnoreReturnValue public @NonNull Builder setToolbarColor(@Nullable Long setterArg) { this.toolbarColor = setterArg; return this; @@ -699,6 +732,7 @@ public static final class Builder { private @Nullable Long navigationBarColor; + @CanIgnoreReturnValue public @NonNull Builder setNavigationBarColor(@Nullable Long setterArg) { this.navigationBarColor = setterArg; return this; @@ -706,6 +740,7 @@ public static final class Builder { private @Nullable Long navigationBarDividerColor; + @CanIgnoreReturnValue public @NonNull Builder setNavigationBarDividerColor(@Nullable Long setterArg) { this.navigationBarDividerColor = setterArg; return this; @@ -786,6 +821,7 @@ public static final class Builder { private @Nullable Double initialHeight; + @CanIgnoreReturnValue public @NonNull Builder setInitialHeight(@NonNull Double setterArg) { this.initialHeight = setterArg; return this; @@ -793,6 +829,7 @@ public static final class Builder { private @Nullable Long activityHeightResizeBehavior; + @CanIgnoreReturnValue public @NonNull Builder setActivityHeightResizeBehavior(@NonNull Long setterArg) { this.activityHeightResizeBehavior = setterArg; return this; @@ -800,6 +837,7 @@ public static final class Builder { private @Nullable Long cornerRadius; + @CanIgnoreReturnValue public @NonNull Builder setCornerRadius(@Nullable Long setterArg) { this.cornerRadius = setterArg; return this; diff --git a/flutter_custom_tabs_android/lib/src/messages/messages.g.dart b/flutter_custom_tabs_android/lib/src/messages/messages.g.dart index 366f700..0cc090e 100644 --- a/flutter_custom_tabs_android/lib/src/messages/messages.g.dart +++ b/flutter_custom_tabs_android/lib/src/messages/messages.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v14.0.0), do not edit directly. +// Autogenerated from Pigeon (v17.1.1), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/flutter_custom_tabs_android/pubspec.yaml b/flutter_custom_tabs_android/pubspec.yaml index 7569ce4..164ec5a 100644 --- a/flutter_custom_tabs_android/pubspec.yaml +++ b/flutter_custom_tabs_android/pubspec.yaml @@ -29,4 +29,4 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 - pigeon: ^14.0.0 \ No newline at end of file + pigeon: ^17.0.0 \ No newline at end of file diff --git a/flutter_custom_tabs_ios/ios/Classes/messages.g.swift b/flutter_custom_tabs_ios/ios/Classes/messages.g.swift index adfef95..2860073 100644 --- a/flutter_custom_tabs_ios/ios/Classes/messages.g.swift +++ b/flutter_custom_tabs_ios/ios/Classes/messages.g.swift @@ -1,13 +1,14 @@ -// Autogenerated from Pigeon (v14.0.0), do not edit directly. +// Autogenerated from Pigeon (v17.1.1), do not edit directly. // See also: https://pub.dev/packages/pigeon import Foundation + #if os(iOS) -import Flutter + import Flutter #elseif os(macOS) -import FlutterMacOS + import FlutterMacOS #else -#error("Unsupported platform.") + #error("Unsupported platform.") #endif private func wrapResult(_ result: Any?) -> [Any?] { @@ -19,13 +20,13 @@ private func wrapError(_ error: Any) -> [Any?] { return [ flutterError.code, flutterError.message, - flutterError.details + flutterError.details, ] } return [ "\(error)", "\(type(of: error))", - "Stacktrace: \(Thread.callStackSymbols)" + "Stacktrace: \(Thread.callStackSymbols)", ] } @@ -124,12 +125,12 @@ struct UISheetPresentationControllerConfiguration { private class CustomTabsApiCodecReader: FlutterStandardReader { override func readValue(ofType type: UInt8) -> Any? { switch type { - case 128: - return SFSafariViewControllerOptions.fromList(self.readValue() as! [Any?]) - case 129: - return UISheetPresentationControllerConfiguration.fromList(self.readValue() as! [Any?]) - default: - return super.readValue(ofType: type) + case 128: + return SFSafariViewControllerOptions.fromList(self.readValue() as! [Any?]) + case 129: + return UISheetPresentationControllerConfiguration.fromList(self.readValue() as! [Any?]) + default: + return super.readValue(ofType: type) } } } @@ -183,10 +184,10 @@ class CustomTabsApiSetup { let optionsArg: SFSafariViewControllerOptions? = nilOrValue(args[2]) api.launchURL(urlStringArg, prefersDeepLink: prefersDeepLinkArg, options: optionsArg) { result in switch result { - case .success: - reply(wrapResult(nil)) - case .failure(let error): - reply(wrapError(error)) + case .success: + reply(wrapResult(nil)) + case .failure(let error): + reply(wrapError(error)) } } } diff --git a/flutter_custom_tabs_ios/lib/src/messages/messages.g.dart b/flutter_custom_tabs_ios/lib/src/messages/messages.g.dart index 5d5992a..d8ed07a 100644 --- a/flutter_custom_tabs_ios/lib/src/messages/messages.g.dart +++ b/flutter_custom_tabs_ios/lib/src/messages/messages.g.dart @@ -1,4 +1,4 @@ -// Autogenerated from Pigeon (v14.0.0), do not edit directly. +// Autogenerated from Pigeon (v17.1.1), do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers diff --git a/flutter_custom_tabs_ios/pubspec.yaml b/flutter_custom_tabs_ios/pubspec.yaml index 64584b1..f0c7438 100644 --- a/flutter_custom_tabs_ios/pubspec.yaml +++ b/flutter_custom_tabs_ios/pubspec.yaml @@ -20,7 +20,7 @@ dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^2.0.1 - pigeon: ^14.0.0 + pigeon: ^17.0.0 flutter: plugin: From fd589be5f231e6bfcf28d710cdc12dcfb4858833 Mon Sep 17 00:00:00 2001 From: Shinya Kumagai Date: Sun, 3 Mar 2024 19:36:13 +0900 Subject: [PATCH 3/3] Update rest dependencies --- flutter_custom_tabs/example/pubspec.yaml | 2 +- flutter_custom_tabs/pubspec.yaml | 8 ++++---- flutter_custom_tabs_android/android/build.gradle | 2 +- flutter_custom_tabs_android/example/android/build.gradle | 2 +- flutter_custom_tabs_android/example/pubspec.yaml | 4 ++-- flutter_custom_tabs_android/pubspec.yaml | 4 ++-- flutter_custom_tabs_ios/example/pubspec.yaml | 2 +- flutter_custom_tabs_ios/ios/Classes/Laucher.swift | 7 +++---- flutter_custom_tabs_ios/pubspec.yaml | 4 ++-- flutter_custom_tabs_platform_interface/pubspec.yaml | 6 +++--- flutter_custom_tabs_web/example/pubspec.yaml | 6 +++--- flutter_custom_tabs_web/pubspec.yaml | 8 ++++---- 12 files changed, 27 insertions(+), 28 deletions(-) diff --git a/flutter_custom_tabs/example/pubspec.yaml b/flutter_custom_tabs/example/pubspec.yaml index 9b03258..5e1378b 100644 --- a/flutter_custom_tabs/example/pubspec.yaml +++ b/flutter_custom_tabs/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1 flutter: uses-material-design: true \ No newline at end of file diff --git a/flutter_custom_tabs/pubspec.yaml b/flutter_custom_tabs/pubspec.yaml index 19ee00e..0832da3 100644 --- a/flutter_custom_tabs/pubspec.yaml +++ b/flutter_custom_tabs/pubspec.yaml @@ -24,14 +24,14 @@ dependencies: # flutter_custom_tabs_web: ^2.0.0 flutter_custom_tabs_web: path: ../flutter_custom_tabs_web - meta: ^1.9.1 + meta: ^1.10.0 dev_dependencies: flutter_test: sdk: flutter - mockito: ^5.4.2 - flutter_lints: ^2.0.1 - plugin_platform_interface: ^2.1.5 + mockito: ^5.4.4 + flutter_lints: ^3.0.1 + plugin_platform_interface: ^2.1.7 flutter: plugin: diff --git a/flutter_custom_tabs_android/android/build.gradle b/flutter_custom_tabs_android/android/build.gradle index 6601cb5..4a36327 100644 --- a/flutter_custom_tabs_android/android/build.gradle +++ b/flutter_custom_tabs_android/android/build.gradle @@ -49,7 +49,7 @@ android { dependencies { implementation 'androidx.browser:browser:1.5.0' - implementation 'com.github.droibit:customtabslauncher:2.0.0-rc01' + implementation 'com.github.droibit:customtabslauncher:2.0.0' testImplementation 'junit:junit:4.13.2' testImplementation 'org.robolectric:robolectric:4.10.3' diff --git a/flutter_custom_tabs_android/example/android/build.gradle b/flutter_custom_tabs_android/example/android/build.gradle index 1bfe3cf..7e430b1 100644 --- a/flutter_custom_tabs_android/example/android/build.gradle +++ b/flutter_custom_tabs_android/example/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.android.tools.build:gradle:8.1.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/flutter_custom_tabs_android/example/pubspec.yaml b/flutter_custom_tabs_android/example/pubspec.yaml index 8c222e9..0f23acd 100644 --- a/flutter_custom_tabs_android/example/pubspec.yaml +++ b/flutter_custom_tabs_android/example/pubspec.yaml @@ -11,14 +11,14 @@ dependencies: sdk: flutter flutter_custom_tabs_android: path: ../ - dynamic_color: ^1.6.7 + dynamic_color: ^1.7.0 dev_dependencies: integration_test: sdk: flutter flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1 flutter: uses-material-design: true diff --git a/flutter_custom_tabs_android/pubspec.yaml b/flutter_custom_tabs_android/pubspec.yaml index 164ec5a..965c134 100644 --- a/flutter_custom_tabs_android/pubspec.yaml +++ b/flutter_custom_tabs_android/pubspec.yaml @@ -23,10 +23,10 @@ dependencies: # flutter_custom_tabs_platform_interface: ^2.0.0 flutter_custom_tabs_platform_interface: path: ../flutter_custom_tabs_platform_interface - meta: ^1.9.1 + meta: ^1.10.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1 pigeon: ^17.0.0 \ No newline at end of file diff --git a/flutter_custom_tabs_ios/example/pubspec.yaml b/flutter_custom_tabs_ios/example/pubspec.yaml index 1070fc1..e38c420 100644 --- a/flutter_custom_tabs_ios/example/pubspec.yaml +++ b/flutter_custom_tabs_ios/example/pubspec.yaml @@ -18,7 +18,7 @@ dev_dependencies: sdk: flutter flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1 flutter: uses-material-design: true diff --git a/flutter_custom_tabs_ios/ios/Classes/Laucher.swift b/flutter_custom_tabs_ios/ios/Classes/Laucher.swift index bedf93b..defa74b 100644 --- a/flutter_custom_tabs_ios/ios/Classes/Laucher.swift +++ b/flutter_custom_tabs_ios/ios/Classes/Laucher.swift @@ -16,10 +16,9 @@ open class Launcher { dismissStack.append { [weak viewControllerToPresent] in viewControllerToPresent?.dismiss(animated: true) } - topViewController - .present(viewControllerToPresent, animated: true) { - completion?(true) - } + topViewController.present(viewControllerToPresent, animated: true) { + completion?(true) + } } else { completion?(false) } diff --git a/flutter_custom_tabs_ios/pubspec.yaml b/flutter_custom_tabs_ios/pubspec.yaml index f0c7438..830a1b1 100644 --- a/flutter_custom_tabs_ios/pubspec.yaml +++ b/flutter_custom_tabs_ios/pubspec.yaml @@ -14,12 +14,12 @@ dependencies: # flutter_custom_tabs_platform_interface: ^2.0.0 flutter_custom_tabs_platform_interface: path: ../flutter_custom_tabs_platform_interface - meta: ^1.9.1 + meta: ^1.10.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1 pigeon: ^17.0.0 flutter: diff --git a/flutter_custom_tabs_platform_interface/pubspec.yaml b/flutter_custom_tabs_platform_interface/pubspec.yaml index 6810db6..d5712d3 100644 --- a/flutter_custom_tabs_platform_interface/pubspec.yaml +++ b/flutter_custom_tabs_platform_interface/pubspec.yaml @@ -10,11 +10,11 @@ environment: dependencies: flutter: sdk: flutter - plugin_platform_interface: ^2.1.5 - meta: ^1.9.1 + meta: ^1.10.0 + plugin_platform_interface: ^2.1.7 dev_dependencies: flutter_test: sdk: flutter mockito: ^5.4.2 - flutter_lints: ^2.0.1 \ No newline at end of file + flutter_lints: ^3.0.1 \ No newline at end of file diff --git a/flutter_custom_tabs_web/example/pubspec.yaml b/flutter_custom_tabs_web/example/pubspec.yaml index 8920c8c..b5eab50 100644 --- a/flutter_custom_tabs_web/example/pubspec.yaml +++ b/flutter_custom_tabs_web/example/pubspec.yaml @@ -18,6 +18,6 @@ dev_dependencies: sdk: flutter integration_test: sdk: flutter - mockito: ^5.4.2 - plugin_platform_interface: ^2.1.5 - flutter_lints: ^2.0.1 + mockito: ^5.4.4 + plugin_platform_interface: ^2.1.7 + flutter_lints: ^3.0.1 diff --git a/flutter_custom_tabs_web/pubspec.yaml b/flutter_custom_tabs_web/pubspec.yaml index 3b94d25..8366d46 100644 --- a/flutter_custom_tabs_web/pubspec.yaml +++ b/flutter_custom_tabs_web/pubspec.yaml @@ -24,11 +24,11 @@ dependencies: # flutter_custom_tabs_platform_interface: ^2.0.0 flutter_custom_tabs_platform_interface: path: ../flutter_custom_tabs_platform_interface - meta: ^1.9.1 - url_launcher_web: ^2.0.16 - url_launcher_platform_interface: ^2.1.2 + meta: ^1.10.0 + url_launcher_web: ^2.0.19 + url_launcher_platform_interface: ^2.2.0 dev_dependencies: flutter_test: sdk: flutter - flutter_lints: ^2.0.1 + flutter_lints: ^3.0.1