Skip to content

Commit f370264

Browse files
alyezzalyezz
authored
Downgrade sample app to jdk 1.7 (#75)
1 parent 40e07d7 commit f370264

File tree

142 files changed

+705
-9992
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+705
-9992
lines changed

‎.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ node_modules/
1212

1313
#sample-app
1414
sample-app/.idea
15-
sample-app/platforms/
1615
sample-app/hooks/
1716
sample-app/plugins/

‎sampleApp/package-lock.json

Lines changed: 0 additions & 77 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sampleApp/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
"license": "Apache-2.0",
1515
"dependencies": {
1616
"cordova-android": "^8.0.0",
17-
"cordova-ios": "^5.0.1",
18-
"instabug-cordova": "file:../project"
17+
"cordova-ios": "^5.0.1"
1918
},
2019
"devDependencies": {
2120
"cordova-plugin-whitelist": "^1.3.4"
2221
},
2322
"cordova": {
2423
"plugins": {
25-
"cordova-plugin-whitelist": {},
26-
"instabug-cordova": {}
24+
"cordova-plugin-whitelist": {}
2725
},
2826
"platforms": [
2927
"ios",

‎sampleApp/platforms/android/CordovaLib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ android {
4949
buildToolsVersion cdvBuildToolsVersion
5050

5151
compileOptions {
52-
sourceCompatibility JavaVersion.VERSION_1_8
53-
targetCompatibility JavaVersion.VERSION_1_8
52+
sourceCompatibility '1.7'
53+
targetCompatibility '1.7'
5454
}
5555

5656
sourceSets {

‎sampleApp/platforms/android/android.json

Lines changed: 4 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -11,149 +11,26 @@
1111
{
1212
"xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
1313
"count": 1
14-
},
15-
{
16-
"xml": "<feature name=\"IBGPlugin\"><param name=\"android-package\" value=\"com.instabug.cordova.plugin.IBGPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
17-
"count": 1
1814
}
1915
]
2016
}
2117
},
2218
"AndroidManifest.xml": {
2319
"parents": {
24-
"/manifest/application": [
25-
{
26-
"xml": "<activity android:configChanges=\"keyboardHidden|orientation|screenSize\" android:launchMode=\"singleInstance\" android:name=\"com.instabug.cordova.plugin.IBGPluginActivity\" android:theme=\"@android:style/Theme.NoDisplay\" />",
27-
"count": 1
28-
},
29-
{
30-
"xml": "<service android:name=\"com.instabug.library.network.worker.uploader.InstabugSessionUploaderService\" />",
31-
"count": 1
32-
},
33-
{
34-
"xml": "<service android:name=\"com.instabug.bug.network.InstabugBugsUploaderService\" />",
35-
"count": 1
36-
},
37-
{
38-
"xml": "<service android:name=\"com.instabug.crash.network.InstabugCrashesUploaderService\" />",
39-
"count": 1
40-
},
41-
{
42-
"xml": "<service android:name=\"com.instabug.library.network.worker.fetcher.InstabugFeaturesFetcherService\" />",
43-
"count": 1
44-
},
45-
{
46-
"xml": "<service android:name=\"com.instabug.survey.network.service.InstabugSurveysSubmitterService\" />",
47-
"count": 1
48-
},
49-
{
50-
"xml": "<service android:name=\"com.instabug.library.internal.video.VideoProcessingService\" />",
51-
"count": 1
52-
},
53-
{
54-
"xml": "<service android:name=\"com.instabug.library.analytics.network.InstabugAnalyticsUploaderService\" />",
55-
"count": 1
56-
},
57-
{
58-
"xml": "<service android:name=\"com.instabug.chat.network.InstabugMessageUploaderService\" />",
59-
"count": 1
60-
}
61-
],
62-
"/manifest": [
63-
{
64-
"xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
65-
"count": 1
66-
},
67-
{
68-
"xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
69-
"count": 1
70-
},
71-
{
72-
"xml": "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
73-
"count": 1
74-
},
75-
{
76-
"xml": "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
77-
"count": 1
78-
},
79-
{
80-
"xml": "<uses-permission android:name=\"android.permission.RECORD_AUDIO\" />",
81-
"count": 1
82-
},
83-
{
84-
"xml": "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\" />",
85-
"count": 1
86-
},
87-
{
88-
"xml": "<uses-permission android:name=\"android.permission.INTERNET\" />",
89-
"count": 1
90-
}
91-
]
20+
"/manifest/application": [],
21+
"/manifest": []
9222
}
9323
}
9424
}
9525
},
9626
"installed_plugins": {
9727
"cordova-plugin-whitelist": {
9828
"PACKAGE_NAME": "io.cordova.hellocordova"
99-
},
100-
"instabug-cordova": {
101-
"PACKAGE_NAME": "io.cordova.hellocordova"
10229
}
10330
},
10431
"dependent_plugins": {},
105-
"modules": [
106-
{
107-
"id": "instabug-cordova.Instabug",
108-
"file": "plugins/instabug-cordova/www/instabug.js",
109-
"pluginId": "instabug-cordova",
110-
"clobbers": [
111-
"cordova.plugins.instabug"
112-
]
113-
},
114-
{
115-
"id": "instabug-cordova.BugReporting",
116-
"file": "plugins/instabug-cordova/www/bugReporting.js",
117-
"pluginId": "instabug-cordova",
118-
"clobbers": [
119-
"cordova.plugins.bugReporting"
120-
]
121-
},
122-
{
123-
"id": "instabug-cordova.FeatureRequests",
124-
"file": "plugins/instabug-cordova/www/featureRequests.js",
125-
"pluginId": "instabug-cordova",
126-
"clobbers": [
127-
"cordova.plugins.featureRequests"
128-
]
129-
},
130-
{
131-
"id": "instabug-cordova.Surveys",
132-
"file": "plugins/instabug-cordova/www/surveys.js",
133-
"pluginId": "instabug-cordova",
134-
"clobbers": [
135-
"cordova.plugins.surveys"
136-
]
137-
},
138-
{
139-
"id": "instabug-cordova.Chats",
140-
"file": "plugins/instabug-cordova/www/chats.js",
141-
"pluginId": "instabug-cordova",
142-
"clobbers": [
143-
"cordova.plugins.chats"
144-
]
145-
},
146-
{
147-
"id": "instabug-cordova.Replies",
148-
"file": "plugins/instabug-cordova/www/replies.js",
149-
"pluginId": "instabug-cordova",
150-
"clobbers": [
151-
"cordova.plugins.replies"
152-
]
153-
}
154-
],
32+
"modules": [],
15533
"plugin_metadata": {
156-
"cordova-plugin-whitelist": "1.3.4",
157-
"instabug-cordova": "8.0.4"
34+
"cordova-plugin-whitelist": "1.3.4"
15835
}
15936
}

‎sampleApp/platforms/android/app/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ ext {
9090
}
9191

9292
// PLUGIN GRADLE EXTENSIONS START
93-
apply from: "../instabug-cordova/hellocordova-build.gradle"
9493
// PLUGIN GRADLE EXTENSIONS END
9594

9695
def hasBuildExtras1 = file('build-extras.gradle').exists()
@@ -232,8 +231,8 @@ android {
232231
}
233232

234233
compileOptions {
235-
sourceCompatibility JavaVersion.VERSION_1_8
236-
targetCompatibility JavaVersion.VERSION_1_8
234+
sourceCompatibility '1.7'
235+
targetCompatibility '1.7'
237236
}
238237

239238
if (cdvReleaseSigningPropertiesFile) {

‎sampleApp/platforms/android/app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,6 @@
88
<category android:name="android.intent.category.LAUNCHER" />
99
</intent-filter>
1010
</activity>
11-
<activity android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleInstance" android:name="com.instabug.cordova.plugin.IBGPluginActivity" android:theme="@android:style/Theme.NoDisplay" />
12-
<service android:name="com.instabug.library.network.worker.uploader.InstabugSessionUploaderService" />
13-
<service android:name="com.instabug.bug.network.InstabugBugsUploaderService" />
14-
<service android:name="com.instabug.crash.network.InstabugCrashesUploaderService" />
15-
<service android:name="com.instabug.library.network.worker.fetcher.InstabugFeaturesFetcherService" />
16-
<service android:name="com.instabug.survey.network.service.InstabugSurveysSubmitterService" />
17-
<service android:name="com.instabug.library.internal.video.VideoProcessingService" />
18-
<service android:name="com.instabug.library.analytics.network.InstabugAnalyticsUploaderService" />
19-
<service android:name="com.instabug.chat.network.InstabugMessageUploaderService" />
2011
</application>
2112
<uses-sdk android:targetSdkVersion="28" />
22-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
23-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
24-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
25-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
26-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
27-
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
28-
<uses-permission android:name="android.permission.INTERNET" />
2913
</manifest>

‎sampleApp/platforms/android/app/src/main/assets/www/cordova_plugins.js

Lines changed: 2 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,6 @@
11
cordova.define('cordova/plugin_list', function(require, exports, module) {
2-
module.exports = [
3-
{
4-
"id": "instabug-cordova.Instabug",
5-
"file": "plugins/instabug-cordova/www/instabug.js",
6-
"pluginId": "instabug-cordova",
7-
"clobbers": [
8-
"cordova.plugins.instabug"
9-
]
10-
},
11-
{
12-
"id": "instabug-cordova.BugReporting",
13-
"file": "plugins/instabug-cordova/www/bugReporting.js",
14-
"pluginId": "instabug-cordova",
15-
"clobbers": [
16-
"cordova.plugins.bugReporting"
17-
]
18-
},
19-
{
20-
"id": "instabug-cordova.FeatureRequests",
21-
"file": "plugins/instabug-cordova/www/featureRequests.js",
22-
"pluginId": "instabug-cordova",
23-
"clobbers": [
24-
"cordova.plugins.featureRequests"
25-
]
26-
},
27-
{
28-
"id": "instabug-cordova.Surveys",
29-
"file": "plugins/instabug-cordova/www/surveys.js",
30-
"pluginId": "instabug-cordova",
31-
"clobbers": [
32-
"cordova.plugins.surveys"
33-
]
34-
},
35-
{
36-
"id": "instabug-cordova.Chats",
37-
"file": "plugins/instabug-cordova/www/chats.js",
38-
"pluginId": "instabug-cordova",
39-
"clobbers": [
40-
"cordova.plugins.chats"
41-
]
42-
},
43-
{
44-
"id": "instabug-cordova.Replies",
45-
"file": "plugins/instabug-cordova/www/replies.js",
46-
"pluginId": "instabug-cordova",
47-
"clobbers": [
48-
"cordova.plugins.replies"
49-
]
50-
}
51-
];
2+
module.exports = [];
523
module.exports.metadata = {
53-
"cordova-plugin-whitelist": "1.3.4",
54-
"instabug-cordova": "8.0.4"
4+
"cordova-plugin-whitelist": "1.3.4"
555
};
566
});

‎sampleApp/platforms/android/app/src/main/assets/www/js/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ var app = {
3434
},
3535
cordova.plugins.bugReporting.invocationEvents.button,
3636
{
37+
floatingButtonEdge: 'left',
3738
commentRequired: true,
3839
colorTheme: 'light',
3940
enableIntroDialog: false

0 commit comments

Comments
 (0)