Skip to content

Commit 9ccc329

Browse files
Merge pull request #89 from Fr4gorSoftware/Hotfix-1.2.2
Hotfix 1.2.2
2 parents cbef038 + a0969a4 commit 9ccc329

3 files changed

Lines changed: 11 additions & 3 deletions

File tree

app/app.iml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,24 @@
8484
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8585
<excludeFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/generated/source/r" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8788
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8889
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8991
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9094
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
9195
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
9296
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
9397
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9498
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
95100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
96101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
97103
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
98105
</content>
99106
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
100107
<orderEntry type="sourceFolder" forTests="false" />

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "de.t_dankworth.secscanqr"
88
minSdkVersion 17
99
targetSdkVersion 23
10-
versionCode 14
11-
versionName "1.2.1"
10+
versionCode 15
11+
versionName "1.2.2"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
vectorDrawables.useSupportLibrary = true
1414
}

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<intent-filter>
2020
<action android:name="android.intent.action.MAIN" />
2121
<category android:name="android.intent.category.LAUNCHER" />
22-
22+
</intent-filter>
23+
<intent-filter>
2324
<action android:name="android.intent.action.SEND" />
2425
<category android:name="android.intent.category.DEFAULT" />
2526
<data android:mimeType="image/*" />

0 commit comments

Comments
 (0)