Merge pull request #74 from suatkeskin/develop

Flutter sdk, gradle and customtabslauncher upgrade

.github/workflows/app_facing_package.yml

@@ -27,7 +27,7 @@ jobs:
       run: flutter pub get
       working-directory: ./flutter_custom_tabs
     - name: Check for any formatting issues in the code
-      run: flutter format --set-exit-if-changed .
+      run: dart format --set-exit-if-changed .
       working-directory: ./flutter_custom_tabs
     - name: Statically analyze the Dart code for any errors
       run: flutter analyze .

.github/workflows/platform_interface_package.yml

@@ -27,7 +27,7 @@ jobs:
       run: flutter pub get
       working-directory: ./flutter_custom_tabs_platform_interface
     - name: Check for any formatting issues in the code
-      run: flutter format --set-exit-if-changed .
+      run: dart format --set-exit-if-changed .
       working-directory: ./flutter_custom_tabs_platform_interface
     - name: Statically analyze the Dart code for any errors
       run: flutter analyze .

.github/workflows/web_implementation_package.yml

@@ -27,7 +27,7 @@ jobs:
       run: flutter pub get
       working-directory: ./flutter_custom_tabs_web
     - name: Check for any formatting issues in the code
-      run: flutter format --set-exit-if-changed .
+      run: dart format --set-exit-if-changed .
       working-directory: ./flutter_custom_tabs_web
     - name: Statically analyze the Dart code for any errors
       run: flutter analyze .

.gitignore

@@ -0,0 +1,5 @@
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/

flutter_custom_tabs/.gitignore

@@ -2,7 +2,7 @@
 *.iml
 *.ipr
 *.iws
-.idea/*
+.idea/
 !.idea/codeStyleSettings.xml
 !.idea/runConfigurations/*
 
@@ -16,3 +16,6 @@ pubspec.lock
 
 # Directory created by dartdoc
 doc/api/
+
+# Test Coverage
+/coverage/

flutter_custom_tabs/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.1.1'
     }
 }
 
@@ -23,7 +23,8 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    namespace "com.github.droibit.plugins.customtabs"
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 16
@@ -37,6 +38,6 @@ android {
     }
 
     dependencies {
-        api 'com.github.droibit:customtabslauncher:1.6.0'
+        api 'com.github.droibit:customtabslauncher:1.7.0'
     }
 }

flutter_custom_tabs/android/gradle.properties

@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true

flutter_custom_tabs/example/android/app/build.gradle

@@ -25,16 +25,13 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
-
-    lintOptions {
-        disable 'InvalidPackage'
-    }
+    namespace "com.github.droibit.flutter.plugins.customtabs.example"
+    compileSdkVersion 34
 
     defaultConfig {
         applicationId "com.github.droibit.flutter.plugins.customtabs.example"
         minSdkVersion 16
-        targetSdkVersion 30
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
@@ -45,6 +42,9 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+    lint {
+        disable 'InvalidPackage'
+    }
 }
 
 flutter {

flutter_custom_tabs/example/android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.droibit.flutter.plugins.customtabs.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

flutter_custom_tabs/example/android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.droibit.flutter.plugins.customtabs.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- The INTERNET permission is required for development. Specifically,
          flutter needs it to communicate with the running application
@@ -21,12 +20,13 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- This keeps the window background of the activity showing
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
-            
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

flutter_custom_tabs/example/android/app/src/profile/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.droibit.flutter.plugins.customtabs.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

flutter_custom_tabs/example/android/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.1'
     }
 }
 
@@ -25,6 +25,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

flutter_custom_tabs/example/pubspec.yaml

@@ -4,7 +4,7 @@ description: Demonstrates how to use the flutter_custom_tabs plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
 
 dependencies:
   cupertino_icons: ^1.0.2

flutter_custom_tabs/pubspec.yaml

@@ -4,22 +4,22 @@ version: 1.0.4
 homepage: https://github.com/droibit/flutter_custom_tabs
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
   flutter:
     sdk: flutter
   flutter_custom_tabs_platform_interface: ^1.0.1
   flutter_custom_tabs_web: ^1.0.0
-  meta: ^1.3.0
+  meta: ^1.9.1
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.9
-  pedantic: ^1.11.0
-  plugin_platform_interface: ^2.0.0
+  mockito: ^5.4.2
+  pedantic: ^1.11.1
+  plugin_platform_interface: ^2.1.5
 
 flutter:
   plugin:

flutter_custom_tabs/test/launcher_test.dart

@@ -117,8 +117,7 @@ void main() {
       safariVCOption: anyNamed('safariVCOption'),
     )).thenAnswer((_) async => null);
 
-    final binding = TestWidgetsFlutterBinding.ensureInitialized()
-        as TestWidgetsFlutterBinding;
+    final binding = TestWidgetsFlutterBinding.ensureInitialized();
     debugDefaultTargetPlatformOverride = TargetPlatform.iOS;
     expect(binding.renderView.automaticSystemUiAdjustment, isTrue);
 
@@ -142,8 +141,7 @@ void main() {
       safariVCOption: anyNamed('safariVCOption'),
     )).thenAnswer((_) async => null);
 
-    final binding = TestWidgetsFlutterBinding.ensureInitialized()
-        as TestWidgetsFlutterBinding;
+    final binding = TestWidgetsFlutterBinding.ensureInitialized();
     debugDefaultTargetPlatformOverride = TargetPlatform.android;
     expect(binding.renderView.automaticSystemUiAdjustment, true);
 

flutter_custom_tabs_platform_interface/.gitignore

@@ -2,7 +2,7 @@
 *.iml
 *.ipr
 *.iws
-.idea/*
+.idea/
 !.idea/codeStyleSettings.xml
 !.idea/runConfigurations/*
 
@@ -16,3 +16,6 @@ pubspec.lock
 
 # Directory created by dartdoc
 doc/api/
+
+# Covarage
+/coverage/

flutter_custom_tabs_platform_interface/lib/src/safari_view_controller_option.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/painting.dart';
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart';
 

flutter_custom_tabs_platform_interface/pubspec.yaml

@@ -4,17 +4,17 @@ version: 1.0.1
 homepage: https://github.com/droibit/flutter_custom_tabs
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  plugin_platform_interface: ^2.0.0
-  meta: ^1.3.0
+  plugin_platform_interface: ^2.1.5
+  meta: ^1.9.1
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  mockito: ^5.0.9
-  pedantic: ^1.11.0  
+  mockito: ^5.4.2
+  pedantic: ^1.11.1

flutter_custom_tabs_platform_interface/test/flutter_custom_tabs_platform_interface_test.dart

@@ -32,5 +32,5 @@ class _CustomTabsPlatformMock extends Mock
     with MockPlatformInterfaceMixin
     implements CustomTabsPlatform {}
 
-class _ImplementsCustomTabsPlatform extends Mock implements CustomTabsPlatform {
-}
+class _ImplementsCustomTabsPlatform extends Mock
+    implements CustomTabsPlatform {}

flutter_custom_tabs_platform_interface/test/src/method_channel_custom_tabs_test.dart

@@ -11,7 +11,9 @@ void main() {
 
   const channel =
       MethodChannel('plugins.flutter.droibit.github.io/custom_tabs');
-  channel.setMockMethodCallHandler((methodCall) async => log.add(methodCall));
+  TestDefaultBinaryMessengerBinding.instance.defaultBinaryMessenger
+      .setMockMethodCallHandler(
+          channel, (methodCall) async => log.add(methodCall));
 
   setUp(() {
     log = <MethodCall>[];

flutter_custom_tabs_web/example/pubspec.yaml

@@ -2,7 +2,7 @@ name: regular_integration_tests
 publish_to: none
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
   flutter: ">=2.2.0"
 
 dependencies:

flutter_custom_tabs_web/pubspec.yaml

@@ -4,7 +4,7 @@ version: 1.0.0
 homepage: https://github.com/droibit/flutter_custom_tabs
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.12.0 <4.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
@@ -13,7 +13,7 @@ dependencies:
   flutter_web_plugins:
     sdk: flutter
   flutter_custom_tabs_platform_interface: ^1.0.0
-  meta: ^1.3.0
+  meta: ^1.9.1
   url_launcher_web: ^2.0.1
   url_launcher_platform_interface: ^2.0.3