Skip to content

Commit f2568c3

Browse files
abdelhamid-f-nasserabdelhamid-f-nasser
authored
Revert "release/11.14.0 (#390)"
This reverts commit 24d9e2a.
1 parent 24d9e2a commit f2568c3

32 files changed

+164
-549
lines changed

‎.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ commands:
99
setup_flutter:
1010
steps:
1111
- flutter/install_sdk_and_pub:
12-
flutter_version: 3.10.5
12+
flutter_version: 3.3.0
1313
- run:
1414
name: Generate Pigeons
1515
command: sh ./scripts/pigeon.sh
@@ -33,7 +33,7 @@ commands:
3333
steps:
3434
- run:
3535
name: Install Appium
36-
command: npm install -g appium
36+
command: npm install -g appium@next
3737
- when:
3838
condition:
3939
equal:
@@ -42,7 +42,7 @@ commands:
4242
steps:
4343
- run:
4444
name: Install XCUITest Driver
45-
command: appium driver install xcuitest@4.35.0
45+
command: appium driver install xcuitest
4646
- when:
4747
condition:
4848
equal:
@@ -51,7 +51,7 @@ commands:
5151
steps:
5252
- run:
5353
name: Install UIAutomator2 Driver
54-
command: appium driver install uiautomator2@2.29.5
54+
command: appium driver install uiautomator2
5555
- run:
5656
name: Launch Appium
5757
# Enable --relaxed-security for `mobile: shell` command that Captain uses internally.

‎CHANGELOG.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,5 @@
11
# Changelog
22

3-
## [11.14.0](https://github.com/Instabug/Instabug-Flutter/compare/v11.13.0...v11.14.0) (September 13, 2023)
4-
5-
### Added
6-
7-
- Add network logs obfuscation support using the new `NetworkLogger.obfuscateLog` API ([#380](https://github.com/Instabug/Instabug-Flutter/pull/380)).
8-
- Add network logs omission support using the new `NetworkLogger.omitLog` API ([#382](https://github.com/Instabug/Instabug-Flutter/pull/382)).
9-
- Add the new repro steps configuration API `Instabug.setReproStepsConfig` ([#388](https://github.com/Instabug/Instabug-Flutter/pull/388)).
10-
11-
### Changed
12-
13-
- Bump Instabug Android SDK to v11.14.0 ([#384](https://github.com/Instabug/Instabug-Flutter/pull/384)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v11.14.0).
14-
- Bump Instabug iOS SDK to v11.14.0 ([#383](https://github.com/Instabug/Instabug-Flutter/pull/383)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/11.14.0).
15-
16-
### Deprecated
17-
18-
- Deprecate `Instabug.setReproStepsMode` in favor of the new `Instabug.setReproStepsConfig` ([#388](https://github.com/Instabug/Instabug-Flutter/pull/388)).
19-
203
## [11.13.0](https://github.com/Instabug/Instabug-Flutter/compare/v11.12.0...v11.13.0) (July 10, 2023)
214

225
### Changed

‎Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
source "https://rubygems.org"
2+
3+
gem 'danger', '~> 8.6', '>= 8.6.1'

‎Gemfile.lock

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,84 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4+
addressable (2.8.1)
5+
public_suffix (>= 2.0.2, < 6.0)
6+
claide (1.1.0)
7+
claide-plugins (0.9.2)
8+
cork
9+
nap
10+
open4 (~> 1.3)
11+
colored2 (3.1.2)
12+
cork (0.3.0)
13+
colored2 (~> 3.1)
14+
danger (8.6.1)
15+
claide (~> 1.0)
16+
claide-plugins (>= 0.9.2)
17+
colored2 (~> 3.1)
18+
cork (~> 0.1)
19+
faraday (>= 0.9.0, < 2.0)
20+
faraday-http-cache (~> 2.0)
21+
git (~> 1.7)
22+
kramdown (~> 2.3)
23+
kramdown-parser-gfm (~> 1.0)
24+
no_proxy_fix
25+
octokit (~> 4.7)
26+
terminal-table (>= 1, < 4)
27+
faraday (1.10.2)
28+
faraday-em_http (~> 1.0)
29+
faraday-em_synchrony (~> 1.0)
30+
faraday-excon (~> 1.1)
31+
faraday-httpclient (~> 1.0)
32+
faraday-multipart (~> 1.0)
33+
faraday-net_http (~> 1.0)
34+
faraday-net_http_persistent (~> 1.0)
35+
faraday-patron (~> 1.0)
36+
faraday-rack (~> 1.0)
37+
faraday-retry (~> 1.0)
38+
ruby2_keywords (>= 0.0.4)
39+
faraday-em_http (1.0.0)
40+
faraday-em_synchrony (1.0.0)
41+
faraday-excon (1.1.0)
42+
faraday-http-cache (2.4.1)
43+
faraday (>= 0.8)
44+
faraday-httpclient (1.0.1)
45+
faraday-multipart (1.0.4)
46+
multipart-post (~> 2)
47+
faraday-net_http (1.0.1)
48+
faraday-net_http_persistent (1.2.0)
49+
faraday-patron (1.0.0)
50+
faraday-rack (1.0.0)
51+
faraday-retry (1.0.3)
52+
git (1.12.0)
53+
addressable (~> 2.8)
54+
rchardet (~> 1.8)
55+
kramdown (2.4.0)
56+
rexml
57+
kramdown-parser-gfm (1.1.0)
58+
kramdown (~> 2.0)
59+
multipart-post (2.2.3)
60+
nap (1.1.0)
61+
no_proxy_fix (0.1.2)
62+
octokit (4.25.1)
63+
faraday (>= 1, < 3)
64+
sawyer (~> 0.9)
65+
open4 (1.3.4)
66+
public_suffix (5.0.0)
67+
rchardet (1.8.0)
68+
rexml (3.2.5)
69+
ruby2_keywords (0.0.5)
70+
sawyer (0.9.2)
71+
addressable (>= 2.3.5)
72+
faraday (>= 0.17.3, < 3)
73+
terminal-table (3.0.2)
74+
unicode-display_width (>= 1.1.1, < 3)
75+
unicode-display_width (2.3.0)
476

577
PLATFORMS
678
ruby
779

880
DEPENDENCIES
81+
danger (~> 8.6, >= 8.6.1)
982

1083
BUNDLED WITH
1184
1.17.2

‎README.md

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ A Flutter plugin for [Instabug](https://instabug.com/).
2222

2323
### Installation
2424

25+
2526
1. Add Instabug to your `pubspec.yaml` file.
2627

2728
```yaml
@@ -64,23 +65,18 @@ Instabug automatically captures every crash of your app and sends relevant detai
6465

6566
```dart
6667
void main() {
67-
runZonedGuarded(
68-
() {
69-
WidgetsFlutterBinding.ensureInitialized();
70-
71-
Instabug.init(
72-
token: 'APP_TOKEN',
73-
invocationEvents: [InvocationEvent.shake],
74-
);
75-
76-
FlutterError.onError = (FlutterErrorDetails details) {
77-
Zone.current.handleUncaughtError(details.exception, details.stack!);
78-
};
79-
80-
runApp(MyApp());
81-
},
82-
CrashReporting.reportCrash,
68+
WidgetsFlutterBinding.ensureInitialized();
69+
70+
Instabug.init(
71+
token: 'APP_TOKEN',
72+
invocationEvents: [InvocationEvent.floatingButton],
8373
);
74+
75+
FlutterError.onError = (FlutterErrorDetails details) {
76+
Zone.current.handleUncaughtError(details.exception, details.stack!);
77+
};
78+
79+
runZonedGuarded(() => runApp(MyApp()), CrashReporting.reportCrash);
8480
}
8581
```
8682

@@ -94,6 +90,7 @@ Repro Steps list all of the actions an app user took before reporting a bug or c
9490
));
9591
```
9692

93+
9794
## Network Logging
9895
You can choose to attach all your network requests to the reports being sent to the dashboard. To enable the feature when using the `dart:io` package `HttpClient`, please refer to the [Instabug Dart IO Http Client](https://github.com/Instabug/instabug-dart-io-http-client) repository.
9996

‎android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group 'com.instabug.flutter'
2-
version '11.14.0'
2+
version '11.13.0'
33

44
buildscript {
55
repositories {
@@ -41,7 +41,7 @@ android {
4141
}
4242

4343
dependencies {
44-
api 'com.instabug.library:instabug:11.14.0'
44+
api 'com.instabug.library:instabug:11.13.0'
4545

4646
testImplementation 'junit:junit:4.13.2'
4747
testImplementation "org.mockito:mockito-inline:3.12.1"

‎android/src/main/java/com/instabug/flutter/modules/InstabugApi.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
import com.instabug.library.Instabug;
2020
import com.instabug.library.InstabugColorTheme;
2121
import com.instabug.library.InstabugCustomTextPlaceHolder;
22-
import com.instabug.library.IssueType;
2322
import com.instabug.library.Platform;
24-
import com.instabug.library.ReproConfigurations;
2523
import com.instabug.library.internal.module.InstabugLocale;
2624
import com.instabug.library.invocation.InstabugInvocationEvent;
2725
import com.instabug.library.model.NetworkLog;
@@ -285,9 +283,7 @@ public void setSdkDebugLogsLevel(@NonNull String level) {
285283
// iOS Only
286284
}
287285

288-
@SuppressWarnings("deprecation")
289286
@Override
290-
@Deprecated()
291287
public void setReproStepsMode(@NonNull String mode) {
292288
try {
293289
final State resolvedMode = ArgsRegistry.reproStates.get(mode);
@@ -297,29 +293,6 @@ public void setReproStepsMode(@NonNull String mode) {
297293
}
298294
}
299295

300-
@Override
301-
public void setReproStepsConfig(@Nullable String bugMode, @Nullable String crashMode) {
302-
try {
303-
final ReproConfigurations.Builder builder = new ReproConfigurations.Builder();
304-
305-
if (bugMode != null) {
306-
final Integer resolvedBugMode = ArgsRegistry.reproModes.get(bugMode);
307-
builder.setIssueMode(IssueType.Bug, resolvedBugMode);
308-
}
309-
310-
if (crashMode != null) {
311-
final Integer resolvedCrashMode = ArgsRegistry.reproModes.get(crashMode);
312-
builder.setIssueMode(IssueType.Crash, resolvedCrashMode);
313-
}
314-
315-
final ReproConfigurations config = builder.build();
316-
317-
Instabug.setReproConfigurations(config);
318-
} catch (Exception e) {
319-
e.printStackTrace();
320-
}
321-
}
322-
323296
@Override
324297
public void reportScreenChange(@NonNull String screenName) {
325298
try {

‎android/src/main/java/com/instabug/flutter/util/ArgsRegistry.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import com.instabug.library.InstabugColorTheme;
1010
import com.instabug.library.InstabugCustomTextPlaceHolder.Key;
1111
import com.instabug.library.OnSdkDismissCallback.DismissType;
12-
import com.instabug.library.ReproMode;
1312
import com.instabug.library.extendedbugreport.ExtendedBugReport;
1413
import com.instabug.library.internal.module.InstabugLocale;
1514
import com.instabug.library.invocation.InstabugInvocationEvent;
@@ -112,19 +111,12 @@ public T get(Object key) {
112111
put("ExtendedBugReportMode.disabled", ExtendedBugReport.State.DISABLED);
113112
}};
114113

115-
@Deprecated()
116114
public static final ArgsMap<State> reproStates = new ArgsMap<State>() {{
117115
put("ReproStepsMode.enabledWithNoScreenshots", State.ENABLED_WITH_NO_SCREENSHOTS);
118116
put("ReproStepsMode.enabled", State.ENABLED);
119117
put("ReproStepsMode.disabled", State.DISABLED);
120118
}};
121119

122-
public static final ArgsMap<Integer> reproModes = new ArgsMap<Integer>() {{
123-
put("ReproStepsMode.enabledWithNoScreenshots", ReproMode.EnableWithNoScreenshots);
124-
put("ReproStepsMode.enabled", ReproMode.EnableWithScreenshots);
125-
put("ReproStepsMode.disabled", ReproMode.Disable);
126-
}};
127-
128120
public static final ArgsMap<InstabugLocale> locales = new ArgsMap<InstabugLocale>() {{
129121
put("IBGLocale.arabic", InstabugLocale.ARABIC);
130122
put("IBGLocale.azerbaijani", InstabugLocale.AZERBAIJANI);
@@ -222,4 +214,4 @@ public T get(Object key) {
222214
put("CustomTextPlaceHolderKey.messagesNotificationAndOthers", Key.CHATS_MULTIPLE_MESSAGE_NOTIFICATION);
223215
put("CustomTextPlaceHolderKey.insufficientContentMessage", Key.COMMENT_FIELD_INSUFFICIENT_CONTENT);
224216
}};
225-
}
217+
}

‎android/src/test/java/com/instabug/flutter/ArgsRegistryTest.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.instabug.library.InstabugColorTheme;
1111
import com.instabug.library.InstabugCustomTextPlaceHolder.Key;
1212
import com.instabug.library.OnSdkDismissCallback.DismissType;
13-
import com.instabug.library.ReproMode;
1413
import com.instabug.library.extendedbugreport.ExtendedBugReport;
1514
import com.instabug.library.internal.module.InstabugLocale;
1615
import com.instabug.library.invocation.InstabugInvocationEvent;
@@ -184,7 +183,6 @@ public void testExtendedBugReportStates() {
184183
}
185184

186185

187-
@SuppressWarnings("deprecation")
188186
@Test
189187
public void testReproStates() {
190188
State[] values = {
@@ -198,19 +196,6 @@ public void testReproStates() {
198196
}
199197
}
200198

201-
@Test
202-
public void testReproModes() {
203-
Integer[] values = {
204-
ReproMode.Disable,
205-
ReproMode.EnableWithScreenshots,
206-
ReproMode.EnableWithNoScreenshots,
207-
};
208-
209-
for (Integer value : values) {
210-
assertTrue(ArgsRegistry.reproModes.containsValue(value));
211-
}
212-
}
213-
214199

215200
@Test
216201
public void testLocales() {

‎android/src/test/java/com/instabug/flutter/InstabugApiTest.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import static org.mockito.ArgumentMatchers.any;
88
import static org.mockito.ArgumentMatchers.anyInt;
99
import static org.mockito.ArgumentMatchers.anyString;
10-
import static org.mockito.ArgumentMatchers.argThat;
1110
import static org.mockito.ArgumentMatchers.eq;
1211
import static org.mockito.Mockito.doReturn;
1312
import static org.mockito.Mockito.mock;
@@ -31,11 +30,8 @@
3130
import com.instabug.library.Instabug;
3231
import com.instabug.library.InstabugColorTheme;
3332
import com.instabug.library.InstabugCustomTextPlaceHolder;
34-
import com.instabug.library.IssueType;
3533
import com.instabug.library.LogLevel;
3634
import com.instabug.library.Platform;
37-
import com.instabug.library.ReproConfigurations;
38-
import com.instabug.library.ReproMode;
3935
import com.instabug.library.invocation.InstabugInvocationEvent;
4036
import com.instabug.library.model.NetworkLog;
4137
import com.instabug.library.ui.onboarding.WelcomeMessage;
@@ -387,7 +383,6 @@ public void testSetDebugEnabled() {
387383
mInstabug.verify(() -> Instabug.setDebugEnabled(isEnabled));
388384
}
389385

390-
@SuppressWarnings("deprecation")
391386
@Test
392387
public void testSetReproStepsMode() {
393388
String mode = "ReproStepsMode.enabled";
@@ -397,28 +392,6 @@ public void testSetReproStepsMode() {
397392
mInstabug.verify(() -> Instabug.setReproStepsState(State.ENABLED));
398393
}
399394

400-
@Test
401-
public void testSetReproStepsConfig() {
402-
String bug = "ReproStepsMode.enabled";
403-
String crash = "ReproStepsMode.disabled";
404-
405-
ReproConfigurations config = mock(ReproConfigurations.class);
406-
MockedConstruction<ReproConfigurations.Builder> mReproConfigurationsBuilder = mockConstruction(ReproConfigurations.Builder.class, (mock, context) -> {
407-
when(mock.setIssueMode(anyInt(), anyInt())).thenReturn(mock);
408-
when(mock.build()).thenReturn(config);
409-
});
410-
411-
api.setReproStepsConfig(bug, crash);
412-
413-
ReproConfigurations.Builder builder = mReproConfigurationsBuilder.constructed().get(0);
414-
415-
verify(builder).setIssueMode(IssueType.Bug, ReproMode.EnableWithScreenshots);
416-
verify(builder).setIssueMode(IssueType.Crash, ReproMode.Disable);
417-
verify(builder).build();
418-
419-
mInstabug.verify(() -> Instabug.setReproConfigurations(config));
420-
}
421-
422395
@Test
423396
public void testReportScreenChange() {
424397
String screenName = "HomeScreen";

0 commit comments

Comments
 (0)