Skip to content

Commit 06664bc

Browse files
authored
Export form error and fix iOS error parsing. (#577)
1 parent ebb97e9 commit 06664bc

File tree

8 files changed

+16
-17
lines changed

8 files changed

+16
-17
lines changed

.github/workflows/google_mobile_ads.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
cd packages/google_mobile_ads/ios
6868
pod lib lint --allow-warnings
6969
env:
70-
DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
70+
DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
7171

7272
flutter:
7373
runs-on: ubuntu-latest

packages/google_mobile_ads/example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '9.0'
2+
platform :ios, '11.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

packages/google_mobile_ads/ios/Classes/UserMessagingPlatform/FLTUserMessagingPlatformManager.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ - (void)handleMethodCall:(FlutterMethodCall *_Nonnull)call
7070
initWithFormat:@"%ld",
7171
error
7272
.code]
73-
message:error.domain
74-
details:error.localizedDescription]);
73+
message:error.localizedDescription
74+
details:error.domain]);
7575
}
7676
}];
7777
} else if ([call.method
@@ -85,8 +85,8 @@ - (void)handleMethodCall:(FlutterMethodCall *_Nonnull)call
8585
result([FlutterError
8686
errorWithCode:[[NSString alloc]
8787
initWithFormat:@"%ld", loadError.code]
88-
message:loadError.domain
89-
details:loadError.localizedDescription]);
88+
message:loadError.localizedDescription
89+
details:loadError.domain]);
9090
}
9191
}];
9292
} else if ([call.method isEqualToString:
@@ -105,8 +105,8 @@ - (void)handleMethodCall:(FlutterMethodCall *_Nonnull)call
105105
result([FlutterError
106106
errorWithCode:[[NSString alloc]
107107
initWithFormat:@"%ld", error.code]
108-
message:error.domain
109-
details:error.localizedDescription]);
108+
message:error.localizedDescription
109+
details:error.domain]);
110110
}
111111
}];
112112
} else if ([call.method isEqualToString:@"ConsentForm#dispose"]) {

packages/google_mobile_ads/ios/Tests/UserMessagingPlatform/FLTUserMessagingPlatformManagerTest.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ - (void)testRequestConsentInfoUpdate_error {
132132
completionHandler:[OCMArg any]]);
133133
FlutterError *resultError = (FlutterError *)returnedResult;
134134
XCTAssertEqualObjects(resultError.code, @"1");
135-
XCTAssertEqualObjects(resultError.message, @"domain");
136-
XCTAssertEqualObjects(resultError.details, @"description");
135+
XCTAssertEqualObjects(resultError.details, @"domain");
136+
XCTAssertEqualObjects(resultError.message, @"description");
137137
}
138138

139139
- (void)testLoadConsentForm_successAndDispose {
@@ -183,8 +183,8 @@ - (void)testLoadConsentForm_error {
183183
OCMVerify([mockUmpConsentForm loadWithCompletionHandler:[OCMArg any]]);
184184
FlutterError *resultError = (FlutterError *)returnedResult;
185185
XCTAssertEqualObjects(resultError.code, @"1");
186-
XCTAssertEqualObjects(resultError.message, @"domain");
187-
XCTAssertEqualObjects(resultError.details, @"description");
186+
XCTAssertEqualObjects(resultError.details, @"domain");
187+
XCTAssertEqualObjects(resultError.message, @"description");
188188
}
189189

190190
- (void)testIsConsentFormAvailable_available {
@@ -270,8 +270,8 @@ - (void)testShowConsentForm_error {
270270
completionHandler:[OCMArg any]]);
271271
FlutterError *resultError = (FlutterError *)returnedResult;
272272
XCTAssertEqualObjects(resultError.code, @"1");
273-
XCTAssertEqualObjects(resultError.message, @"domain");
274-
XCTAssertEqualObjects(resultError.details, @"description");
273+
XCTAssertEqualObjects(resultError.details, @"domain");
274+
XCTAssertEqualObjects(resultError.message, @"description");
275275
}
276276

277277
@end

packages/google_mobile_ads/lib/google_mobile_ads.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ export 'src/request_configuration.dart';
2020
export 'src/ump/consent_request_parameters.dart';
2121
export 'src/ump/consent_information.dart';
2222
export 'src/ump/consent_form.dart';
23+
export 'src/ump/form_error.dart';

packages/google_mobile_ads/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ dev_dependencies:
4545

4646

4747
environment:
48-
sdk: ">=2.12.0 <=3.0.0"
48+
sdk: ">=2.12.0 <3.0.0"
4949
flutter: ">=1.12.13+hotfix.5"

packages/google_mobile_ads/test/ump/consent_information_impl_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import 'dart:async';
1616

1717
import 'package:google_mobile_ads/google_mobile_ads.dart';
1818
import 'package:google_mobile_ads/src/ump/consent_information_impl.dart';
19-
import 'package:google_mobile_ads/src/ump/form_error.dart';
2019
import 'package:flutter_test/flutter_test.dart';
2120
import 'package:google_mobile_ads/src/ump/user_messaging_channel.dart';
2221
import 'package:mockito/annotations.dart';

packages/google_mobile_ads/test/ump/user_messaging_channel_test.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import 'dart:async';
1616

1717
import 'package:google_mobile_ads/src/ump/consent_form_impl.dart';
18-
import 'package:google_mobile_ads/src/ump/form_error.dart';
1918
import 'package:flutter/services.dart';
2019
import 'package:flutter_test/flutter_test.dart';
2120
import 'package:google_mobile_ads/google_mobile_ads.dart';

0 commit comments

Comments
 (0)