Skip to content

Commit b685496

Browse files
alyezzAli Abdelfattah
authored and
Ali Abdelfattah
committed
Bumping to v9 (#99)
* Bumping native SDKs to v9 * migrating to androidx * remove removed enum * use xcode 11 * ci * Update simulator ios version * ci * adjusting tests * Update CHANGELOG.md
1 parent 4e8fd15 commit b685496

File tree

11 files changed

+26
-24
lines changed

11 files changed

+26
-24
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## Version 9.0.0 (2019-12-09)
2+
3+
* Updated native SDKs to v9.0
4+
15
## Version 8.7.0 (2019-11-11)
26

37
* Updates native SDK dependencies to 8.7

android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ android {
2626

2727
defaultConfig {
2828
minSdkVersion 16
29-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
29+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3030
}
3131
lintOptions {
3232
disable 'InvalidPackage'
3333
}
3434
}
3535

3636
dependencies {
37-
implementation 'com.instabug.library:instabug:8.7.2.1'
37+
implementation 'com.instabug.library:instabug:9.0.0.0'
3838
testImplementation 'junit:junit:4.12'
3939
}

android/src/main/java/com/instabug/instabugflutter/ArgsRegistry.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.instabug.bug.BugReporting;
44
import com.instabug.bug.invocation.Option;
5-
import com.instabug.library.ActionType;
5+
import com.instabug.featuresrequest.ActionType;
66
import com.instabug.library.InstabugColorTheme;
77
import com.instabug.library.InstabugCustomTextPlaceHolder;
88
import com.instabug.library.extendedbugreport.ExtendedBugReport;
@@ -199,8 +199,6 @@ static void registerInstabugExtendedBugReportModeArgs(Map<String, Object> args)
199199
}
200200

201201
static void registerInstabugActionTypesArgs(Map<String, Object> args) {
202-
args.put("ActionType.allActions", ActionType.ALL_ACTIONS);
203-
args.put("ActionType.reportBug", ActionType.REPORT_BUG);
204202
args.put("ActionType.requestNewFeature",ActionType.REQUEST_NEW_FEATURE);
205203
args.put("ActionType.addCommentToFeature",ActionType.ADD_COMMENT_TO_FEATURE);
206204
}

example/android/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838
targetSdkVersion 27
3939
versionCode flutterVersionCode.toInteger()
4040
versionName flutterVersionName
41-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
41+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4242
}
4343

4444
buildTypes {
@@ -59,9 +59,9 @@ flutter {
5959

6060
dependencies {
6161
testImplementation 'junit:junit:4.12'
62-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
63-
androidTestImplementation 'com.android.support.test:rules:1.0.2'
64-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
62+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
63+
androidTestImplementation 'androidx.test:rules:1.1.1'
64+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
6565
testImplementation 'org.mockito:mockito-core:1.10.19'
6666
implementation 'org.mockito:mockito-core:1.10.19'
6767
}

example/android/app/src/androidTest/java/com/instabug/instabugflutterexample/InvokeInstabugUITest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.instabug.instabugflutterexample;
22

3-
import android.support.test.rule.ActivityTestRule;
4-
import android.support.test.runner.AndroidJUnit4;
3+
import androidx.test.rule.ActivityTestRule;
4+
import androidx.test.ext.junit.runners.AndroidJUnit4;
55

66
import org.junit.Rule;
77
import org.junit.Test;
@@ -10,11 +10,11 @@
1010
import java.lang.reflect.InvocationTargetException;
1111
import java.lang.reflect.Method;
1212

13-
import static android.support.test.espresso.Espresso.onView;
14-
import static android.support.test.espresso.action.ViewActions.click;
15-
import static android.support.test.espresso.action.ViewActions.replaceText;
16-
import static android.support.test.espresso.matcher.ViewMatchers.withResourceName;
17-
import static android.support.test.espresso.matcher.ViewMatchers.withText;
13+
import static androidx.test.espresso.Espresso.onView;
14+
import static androidx.test.espresso.action.ViewActions.click;
15+
import static androidx.test.espresso.action.ViewActions.replaceText;
16+
import static androidx.test.espresso.matcher.ViewMatchers.withResourceName;
17+
import static androidx.test.espresso.matcher.ViewMatchers.withText;
1818

1919
@RunWith(AndroidJUnit4.class)
2020
public class InvokeInstabugUITest {

example/android/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.2.1'
8+
classpath 'com.android.tools.build:gradle:3.5.2'
99
}
1010
}
1111

example/android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
android.enableJetifier=true
2+
android.useAndroidX=true
13
org.gradle.jvmargs=-Xmx1536M
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Wed Nov 27 13:45:55 EET 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

ios/instabug_flutter.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ A new flutter plugin project.
1515
s.source_files = 'Classes/**/*'
1616
s.public_header_files = 'Classes/**/*.h'
1717
s.dependency 'Flutter'
18-
s.dependency 'Instabug', '8.7.3'
18+
s.dependency 'Instabug', '9.0.1'
1919

2020
s.ios.deployment_target = '10.0'
2121
s.pod_target_xcconfig = { 'OTHER_LDFLAGS' => '-framework "Flutter" -framework "Instabug"'}

lib/FeatureRequests.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ import 'dart:async';
22
import 'package:flutter/services.dart';
33

44
enum ActionType {
5-
allActions,
6-
reportBug,
75
requestNewFeature,
86
addCommentToFeature
97
}

test/instabug_flutter_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,8 @@ test('startWithToken:invocationEvents: Test', () async {
534534

535535
test('setEmailFieldRequiredForFeatureRequests:forAction: Test', () async {
536536
bool isEmailFieldRequired = false;
537-
final List<dynamic> args = <dynamic>[isEmailFieldRequired, <String>[ActionType.allActions.toString()]];
538-
FeatureRequests.setEmailFieldRequired(isEmailFieldRequired, [ActionType.allActions]);
537+
final List<dynamic> args = <dynamic>[isEmailFieldRequired, <String>[ActionType.addCommentToFeature.toString()]];
538+
FeatureRequests.setEmailFieldRequired(isEmailFieldRequired, [ActionType.addCommentToFeature]);
539539
expect(log, <Matcher>[
540540
isMethodCall('setEmailFieldRequiredForFeatureRequests:forAction:',
541541
arguments: args,

0 commit comments

Comments
 (0)