Skip to content

Commit

Permalink
Compatibility with Dart 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
regdos committed Jul 30, 2024
1 parent f3e425e commit fc07519
Show file tree
Hide file tree
Showing 66 changed files with 221 additions and 221 deletions.
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.payu.flutter.demo"
minSdkVersion 19
minSdkVersion flutter.minSdkVersion
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
2 changes: 1 addition & 1 deletion example/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
17 changes: 9 additions & 8 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
PODS:
- Flutter (1.0.0)
- path_provider_ios (0.0.1):
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- payu_mobile_payments_ios (0.0.1):
- Flutter
- url_launcher_ios (0.0.1):
Expand All @@ -11,16 +12,16 @@ PODS:

DEPENDENCIES:
- Flutter (from `Flutter`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- payu_mobile_payments_ios (from `.symlinks/plugins/payu_mobile_payments_ios/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)

EXTERNAL SOURCES:
Flutter:
:path: Flutter
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
payu_mobile_payments_ios:
:path: ".symlinks/plugins/payu_mobile_payments_ios/ios"
url_launcher_ios:
Expand All @@ -29,12 +30,12 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/webview_flutter_wkwebview/ios"

SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
payu_mobile_payments_ios: 346266119d695d016bff3ec413602064de303bb6
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
url_launcher_ios: 6116280ddcfe98ab8820085d8d76ae7449447586
webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f

PODFILE CHECKSUM: cc1f88378b4bfcf93a6ce00d2c587857c6008d3b

COCOAPODS: 1.11.3
COCOAPODS: 1.15.2
13 changes: 8 additions & 5 deletions example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 54;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -156,7 +156,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down Expand Up @@ -200,10 +200,12 @@
/* Begin PBXShellScriptBuildPhase section */
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
Expand All @@ -214,6 +216,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
Expand Down Expand Up @@ -340,7 +343,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -414,7 +417,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -463,7 +466,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions example/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,7 @@
</dict>
</dict>
</dict>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion example/lib/apps/example_add_card_widget_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void main() {
}

class HomePage extends StatefulWidget {
const HomePage({Key? key}) : super(key: key);
const HomePage({super.key});

@override
State<HomePage> createState() => _HomePageState();
Expand Down
2 changes: 1 addition & 1 deletion example/lib/apps/example_apple_pay_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void main() {
}

class HomePage extends StatefulWidget {
const HomePage({Key? key}) : super(key: key);
const HomePage({super.key});

@override
State<HomePage> createState() => _HomePageState();
Expand Down
2 changes: 1 addition & 1 deletion example/lib/apps/example_mastercard_installments_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void main() {
}

class HomePage extends StatelessWidget {
const HomePage({Key? key}) : super(key: key);
const HomePage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
2 changes: 1 addition & 1 deletion example/lib/apps/example_terms_and_conditions_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void main() {
}

class HomePage extends StatelessWidget {
const HomePage({Key? key}) : super(key: key);
const HomePage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
2 changes: 1 addition & 1 deletion example/lib/apps/example_three_ds_soft_accept_app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ void main() {
}

class HomePage extends StatelessWidget {
const HomePage({Key? key}) : super(key: key);
const HomePage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:payu/payu.dart';
import 'package:example/features/demo_add_card_widget/demo_add_card_widget_controller.dart';

class DemoAddCardWidgetPage extends GetView<DemoAddCardWidgetController> {
const DemoAddCardWidgetPage({Key? key}) : super(key: key);
const DemoAddCardWidgetPage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
2 changes: 1 addition & 1 deletion example/lib/features/demo_features/demo_features_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:get/get.dart';
import 'package:payu/payu.dart';

class DemoFeaturesPage extends GetView<DemoFeaturesController> {
const DemoFeaturesPage({Key? key}) : super(key: key);
const DemoFeaturesPage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:get/get.dart';
import 'package:payu/payu.dart';

class DemoPaymentWidgetPage extends GetView<DemoPaymentWidgetController> implements PaymentMethodsListener {
const DemoPaymentWidgetPage({Key? key}) : super(key: key);
const DemoPaymentWidgetPage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:payu/payu.dart';
import 'package:example/features/demo_terms_and_conditions/demo_terms_and_conditions_controller.dart';

class DemoTermsAndConditionsPage extends GetView<DemoTermsAndConditionsController> {
const DemoTermsAndConditionsPage({Key? key}) : super(key: key);
const DemoTermsAndConditionsPage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions example/lib/features/demo_theme/demo_theme_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:example/features/demo_theme/demo_theme_controller.dart';
class DemoThemePage extends GetView<DemoThemeController> {
static const _awesomeColor = Colors.amber;

const DemoThemePage({Key? key}) : super(key: key);
const DemoThemePage({super.key});

@override
Widget build(BuildContext context) {
Expand All @@ -24,7 +24,7 @@ class DemoThemePage extends GetView<DemoThemeController> {
colorScheme: theme.colorScheme.copyWith(primary: _awesomeColor),
),
child: Scaffold(
backgroundColor: Theme.of(context).backgroundColor,
backgroundColor: Theme.of(context).colorScheme.surface,
appBar: AppBar(
title: PayuImage.logo(),
leading: IconButton(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:payu/payu.dart';
import 'package:example/features/demo_web_payments_secure/demo_web_payments_secure_controller.dart';

class DemoWebPaymentsSecurePage extends GetView<DemoWebPaymentsSecureController> {
const DemoWebPaymentsSecurePage({Key? key}) : super(key: key);
const DemoWebPaymentsSecurePage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:flutter/material.dart';
import 'package:get/get.dart';

class EnvironmentsCreatePage extends GetView<EnvironmentsCreateController> {
const EnvironmentsCreatePage({Key? key}) : super(key: key);
const EnvironmentsCreatePage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
18 changes: 9 additions & 9 deletions example/lib/features/example/backend/api/api.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import 'package:dio/dio.dart';

import 'package:example/data/models/request_response.dart';

class _ErrorInterceptorDioError extends DioError {
class _ErrorInterceptorDioError extends DioException {
_ErrorInterceptorDioError({
required RequestOptions requestOptions,
required dynamic error,
}) : super(requestOptions: requestOptions, error: error);
required super.requestOptions,
required dynamic super.error,
});

@override
String toString() => error.toString();
}

class ErrorInterceptor extends InterceptorsWrapper {
@override
void onError(DioError err, ErrorInterceptorHandler handler) {
void onError(DioException err, ErrorInterceptorHandler handler) {
if (err.response != null) {
if (err.response?.data is Map<String, dynamic>) {
final json = err.response?.data as Map<String, dynamic>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:get/get.dart';
import 'package:example/features/example/features/checkout/example_checkout_controller.dart';

class ExampleCheckoutPage extends GetView<ExampleCheckoutController> {
const ExampleCheckoutPage({Key? key}) : super(key: key);
const ExampleCheckoutPage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:example/features/example/features/method/blik/example_blik_alert
class ExampleBlikAlertDialog extends StatelessWidget {
final _controller = ExampleBlikAlertDialogController();

ExampleBlikAlertDialog({Key? key}) : super(key: key);
ExampleBlikAlertDialog({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:get/get.dart';
import 'package:example/features/example/features/method/example_method_controller.dart';

class ExampleMethodPage extends GetView<ExampleMethodController> {
const ExampleMethodPage({Key? key}) : super(key: key);
const ExampleMethodPage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import 'package:get/get.dart';
import './example_order_controller.dart';

class ExampleOrderPage extends GetView<ExampleOrderController> {
const ExampleOrderPage({Key? key}) : super(key: key);
const ExampleOrderPage({super.key});

@override
Widget build(BuildContext context) {
Expand Down
Loading

0 comments on commit fc07519

Please sign in to comment.