Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'Hotfix-BuildFrudis' into develop

Browse Source 
Finish Hotfix-BuildFrudis

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	.idea/runConfigurations/app.xml
This commit is contained in:
Giuseppe Scorrano
2019-09-12 12:45:25 +02:00
parent 565b465462 0cd3d85321
commit e51c8a73ce
16 changed files with 217 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/gradle.xml generated
View File

@@ -11,6 +11,7 @@
<option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/barcode_base_library" />
<option value="$PROJECT_DIR$/dynamic__base" />
<option value="$PROJECT_DIR$/dynamic_frudis" />
<option value="$PROJECT_DIR$/dynamic_ime" />
<option value="$PROJECT_DIR$/dynamic_vgalimenti" />
<option value="$PROJECT_DIR$/honeywellscannerlibrary" />
@@ -19,6 +20,7 @@
</set>
</option>
<option name="resolveModulePerSourceSet" value="false" />
<option name="testRunner" value="PLATFORM" />
</GradleProjectSettings>
</option>
</component>

1
.idea/modules.xml generated
View File

@@ -6,6 +6,7 @@
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
<module fileurl="file://$PROJECT_DIR$/barcode_base_library/barcode_base_library.iml" filepath="$PROJECT_DIR$/barcode_base_library/barcode_base_library.iml" />
<module fileurl="file://$PROJECT_DIR$/dynamic__base/dynamic__base.iml" filepath="$PROJECT_DIR$/dynamic__base/dynamic__base.iml" />
<module fileurl="file://$PROJECT_DIR$/dynamic_frudis/dynamic_frudis.iml" filepath="$PROJECT_DIR$/dynamic_frudis/dynamic_frudis.iml" />
<module fileurl="file://$PROJECT_DIR$/dynamic_ime/dynamic_ime.iml" filepath="$PROJECT_DIR$/dynamic_ime/dynamic_ime.iml" />
<module fileurl="file://$PROJECT_DIR$/dynamic_vgalimenti/dynamic_vgalimenti.iml" filepath="$PROJECT_DIR$/dynamic_vgalimenti/dynamic_vgalimenti.iml" />
<module fileurl="file://$PROJECT_DIR$/honeywellscannerlibrary/honeywellscannerlibrary.iml" filepath="$PROJECT_DIR$/honeywellscannerlibrary/honeywellscannerlibrary.iml" />

2
.idea/runConfigurations/app.xml generated
View File

@@ -6,7 +6,7 @@
<option name="DEPLOY_AS_INSTANT" value="false" />
<option name="ARTIFACT_NAME" value="" />
<option name="PM_INSTALL_OPTIONS" value="" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_ime,dynamic_vgalimenti" />
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime,dynamic_vgalimenti" />
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
<option name="MODE" value="default_activity" />
<option name="CLEAR_LOGCAT" value="true" />