Skip to content
This repository was archived by the owner on Jul 12, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
enh: DEV-156308 Convert flutter_platform out of a monorepo
  • Loading branch information
brennan-smith authored and m-skolnick committed Jun 15, 2023
commit b3f35714356d2f8c0c573e3c091ac5267f23fced
4 changes: 4 additions & 0 deletions packages/webview_flutter/webview_flutter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 5.12.0

- enh: DEV-156308 Convert flutter_platform out of a monorepo

# 5.11.0

- enh: DEV-148888 Drop Android 8 Support
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';

import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test.dart';
import 'package:webview_flutter/platform_interface.dart';
import 'package:webview_flutter/webview_flutter.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';

import 'package:alkami_core_dependencies/alkami_core_dependencies.dart';
import 'package:flutter/material.dart';
import 'package:path_provider/path_provider.dart';
import 'package:permission_handler/permission_handler.dart';

import 'package:webview_flutter/webview_flutter.dart';

Future<void> main() async {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ environment:
flutter: ">=3.3.0"

dependencies:
alkami_core_dependencies:
hosted: https://dart.cloudsmith.io/alkami/flutter/
version: ^3.0.0

flutter:
sdk: flutter

Expand All @@ -25,10 +21,6 @@ dependencies:
path: ../

dev_dependencies:
alkami_core_dev_dependencies:
hosted: https://dart.cloudsmith.io/alkami/flutter/
version: ^3.0.0

espresso: ^0.1.0+2
flutter_driver:
sdk: flutter
Expand Down
10 changes: 4 additions & 6 deletions packages/webview_flutter/webview_flutter/lib/src/webview.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
import 'dart:async';
import 'dart:io';

import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
import 'package:flutter/rendering.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:webview_flutter/webview_flutter.dart';
import 'package:webview_flutter_android/webview_android_cookie_manager.dart';
import 'package:webview_flutter_android/webview_surface_android.dart';
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';

import '../platform_interface.dart';

/// Optional callback invoked when a web view is first created. [controller] is
/// the [WebViewController] for the created web view.
Expand Down
12 changes: 2 additions & 10 deletions packages/webview_flutter/webview_flutter/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: webview_flutter
description: A Flutter plugin that provides a WebView widget on Android and iOS.
repository: https://github.com/Alkami/plugins/tree/main/packages/webview_flutter
publish_to: https://dart.cloudsmith.io/alkami/flutter/
version: 5.11.0 # original version was 3.0.1 when this was forked
version: 5.12.0 # original version was 3.0.1 when this was forked

environment:
sdk: ">=2.18.0 <3.0.0" # dart version
Expand All @@ -17,13 +17,9 @@ flutter:
default_package: webview_flutter_wkwebview

dependencies:
alkami_core_dependencies:
hosted: https://dart.cloudsmith.io/alkami/flutter/
version: ^3.0.0

flutter:
sdk: flutter
# FOR TESTING ONLY. DO NOT MERGE.

webview_flutter_android:
hosted: https://dart.cloudsmith.io/alkami/flutter/
version: ^5.0.0
Expand All @@ -37,10 +33,6 @@ dependencies:
version: ^5.0.0

dev_dependencies:
alkami_core_dev_dependencies:
hosted: https://dart.cloudsmith.io/alkami/flutter/
version: ^3.0.0

build_runner: ^2.1.5

flutter_driver:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import 'dart:typed_data';

import 'package:alkami_core_dependencies/alkami_core_dependencies.dart' hide CreationParams;
import 'package:alkami_core_dev_dependencies/alkami_core_dev_dependencies.dart';
import 'package:flutter/src/foundation/basic_types.dart';
import 'package:flutter/src/gestures/recognizer.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:mockito/annotations.dart';
import 'package:mockito/mockito.dart';
import 'package:webview_flutter/webview_flutter.dart';
import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';

Expand Down
Loading