Skip to content

Downgrade sample app to jdk 1.7 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Sep 9, 2019
Merged

Downgrade sample app to jdk 1.7 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a2066ac
📝 downgrade to java 1.7
alyezz Sep 9, 2019
5d8cd28
fail ci on purpose
alyezz Sep 9, 2019
afcce34
fail ci
alyezz Sep 9, 2019
1594058
fail ci
alyezz Sep 9, 2019
963157e
fail ci
alyezz Sep 9, 2019
50db1d0
check if java is 1.7 (ci should fail)
alyezz Sep 9, 2019
df54b25
ci
alyezz Sep 9, 2019
2e643dc
📝 git ignore
alyezz Sep 9, 2019
eb772ac
🔥 remove sample app
alyezz Sep 9, 2019
430f1b6
🔥 remove sampleapp
alyezz Sep 9, 2019
57c57c6
✨ Add sample App
alyezz Sep 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ node_modules/

#sample-app
sample-app/.idea
sample-app/platforms/
sample-app/hooks/
sample-app/plugins/
77 changes: 0 additions & 77 deletions sampleApp/package-lock.json
View file
Open in desktop

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

6 changes: 2 additions & 4 deletions sampleApp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,14 @@
"license": "Apache-2.0",
"dependencies": {
"cordova-android": "^8.0.0",
"cordova-ios": "^5.0.1",
"instabug-cordova": "file:../project"
"cordova-ios": "^5.0.1"
},
"devDependencies": {
"cordova-plugin-whitelist": "^1.3.4"
},
"cordova": {
"plugins": {
"cordova-plugin-whitelist": {},
"instabug-cordova": {}
"cordova-plugin-whitelist": {}
},
"platforms": [
"ios",
Expand Down
4 changes: 2 additions & 2 deletions sampleApp/platforms/android/CordovaLib/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ android {
buildToolsVersion cdvBuildToolsVersion

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility '1.7'
targetCompatibility '1.7'
}

sourceSets {
Expand Down
131 changes: 4 additions & 127 deletions sampleApp/platforms/android/android.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,149 +11,26 @@
{
"xml": "<feature name=\"Whitelist\"><param name=\"android-package\" value=\"org.apache.cordova.whitelist.WhitelistPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
},
{
"xml": "<feature name=\"IBGPlugin\"><param name=\"android-package\" value=\"com.instabug.cordova.plugin.IBGPlugin\" /><param name=\"onload\" value=\"true\" /></feature>",
"count": 1
}
]
}
},
"AndroidManifest.xml": {
"parents": {
"/manifest/application": [
{
"xml": "<activity android:configChanges=\"keyboardHidden|orientation|screenSize\" android:launchMode=\"singleInstance\" android:name=\"com.instabug.cordova.plugin.IBGPluginActivity\" android:theme=\"@android:style/Theme.NoDisplay\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.library.network.worker.uploader.InstabugSessionUploaderService\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.bug.network.InstabugBugsUploaderService\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.crash.network.InstabugCrashesUploaderService\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.library.network.worker.fetcher.InstabugFeaturesFetcherService\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.survey.network.service.InstabugSurveysSubmitterService\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.library.internal.video.VideoProcessingService\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.library.analytics.network.InstabugAnalyticsUploaderService\" />",
"count": 1
},
{
"xml": "<service android:name=\"com.instabug.chat.network.InstabugMessageUploaderService\" />",
"count": 1
}
],
"/manifest": [
{
"xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />",
"count": 1
},
{
"xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />",
"count": 1
},
{
"xml": "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\" />",
"count": 1
},
{
"xml": "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\" />",
"count": 1
},
{
"xml": "<uses-permission android:name=\"android.permission.RECORD_AUDIO\" />",
"count": 1
},
{
"xml": "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\" />",
"count": 1
},
{
"xml": "<uses-permission android:name=\"android.permission.INTERNET\" />",
"count": 1
}
]
"/manifest/application": [],
"/manifest": []
}
}
}
},
"installed_plugins": {
"cordova-plugin-whitelist": {
"PACKAGE_NAME": "io.cordova.hellocordova"
},
"instabug-cordova": {
"PACKAGE_NAME": "io.cordova.hellocordova"
}
},
"dependent_plugins": {},
"modules": [
{
"id": "instabug-cordova.Instabug",
"file": "plugins/instabug-cordova/www/instabug.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.instabug"
]
},
{
"id": "instabug-cordova.BugReporting",
"file": "plugins/instabug-cordova/www/bugReporting.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.bugReporting"
]
},
{
"id": "instabug-cordova.FeatureRequests",
"file": "plugins/instabug-cordova/www/featureRequests.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.featureRequests"
]
},
{
"id": "instabug-cordova.Surveys",
"file": "plugins/instabug-cordova/www/surveys.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.surveys"
]
},
{
"id": "instabug-cordova.Chats",
"file": "plugins/instabug-cordova/www/chats.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.chats"
]
},
{
"id": "instabug-cordova.Replies",
"file": "plugins/instabug-cordova/www/replies.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.replies"
]
}
],
"modules": [],
"plugin_metadata": {
"cordova-plugin-whitelist": "1.3.4",
"instabug-cordova": "8.0.4"
"cordova-plugin-whitelist": "1.3.4"
}
}
5 changes: 2 additions & 3 deletions sampleApp/platforms/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ ext {
}

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

def hasBuildExtras1 = file('build-extras.gradle').exists()
Expand Down Expand Up @@ -232,8 +231,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility '1.7'
targetCompatibility '1.7'
}

if (cdvReleaseSigningPropertiesFile) {
Expand Down
16 changes: 0 additions & 16 deletions sampleApp/platforms/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,6 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:configChanges="keyboardHidden|orientation|screenSize" android:launchMode="singleInstance" android:name="com.instabug.cordova.plugin.IBGPluginActivity" android:theme="@android:style/Theme.NoDisplay" />
<service android:name="com.instabug.library.network.worker.uploader.InstabugSessionUploaderService" />
<service android:name="com.instabug.bug.network.InstabugBugsUploaderService" />
<service android:name="com.instabug.crash.network.InstabugCrashesUploaderService" />
<service android:name="com.instabug.library.network.worker.fetcher.InstabugFeaturesFetcherService" />
<service android:name="com.instabug.survey.network.service.InstabugSurveysSubmitterService" />
<service android:name="com.instabug.library.internal.video.VideoProcessingService" />
<service android:name="com.instabug.library.analytics.network.InstabugAnalyticsUploaderService" />
<service android:name="com.instabug.chat.network.InstabugMessageUploaderService" />
</application>
<uses-sdk android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<uses-permission android:name="android.permission.INTERNET" />
</manifest>
54 changes: 2 additions & 52 deletions sampleApp/platforms/android/app/src/main/assets/www/cordova_plugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,6 @@
cordova.define('cordova/plugin_list', function(require, exports, module) {
module.exports = [
{
"id": "instabug-cordova.Instabug",
"file": "plugins/instabug-cordova/www/instabug.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.instabug"
]
},
{
"id": "instabug-cordova.BugReporting",
"file": "plugins/instabug-cordova/www/bugReporting.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.bugReporting"
]
},
{
"id": "instabug-cordova.FeatureRequests",
"file": "plugins/instabug-cordova/www/featureRequests.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.featureRequests"
]
},
{
"id": "instabug-cordova.Surveys",
"file": "plugins/instabug-cordova/www/surveys.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.surveys"
]
},
{
"id": "instabug-cordova.Chats",
"file": "plugins/instabug-cordova/www/chats.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.chats"
]
},
{
"id": "instabug-cordova.Replies",
"file": "plugins/instabug-cordova/www/replies.js",
"pluginId": "instabug-cordova",
"clobbers": [
"cordova.plugins.replies"
]
}
];
module.exports = [];
module.exports.metadata = {
"cordova-plugin-whitelist": "1.3.4",
"instabug-cordova": "8.0.4"
"cordova-plugin-whitelist": "1.3.4"
};
});
1 change: 1 addition & 0 deletions sampleApp/platforms/android/app/src/main/assets/www/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var app = {
},
cordova.plugins.bugReporting.invocationEvents.button,
{
floatingButtonEdge: 'left',
commentRequired: true,
colorTheme: 'light',
enableIntroDialog: false
Expand Down
Loading