Skip to content

Commit cdeff95

Browse files
Fr4gorSoftwareFr4gorSoftware
authored
Merge pull request #59 from Fr4gorSoftware/1.1.9
Version 1.1.9
2 parents 32249ef + aeef4e6 commit cdeff95

5 files changed

Lines changed: 49 additions & 54 deletions

File tree

‎SecScanQR-master.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml‎

Lines changed: 28 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
</facet>
2424
</component>
2525
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
26-
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
27-
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
26+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
27+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2828
<exclude-output />
2929
<content url="file://$MODULE_DIR$">
3030
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3232
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -84,78 +84,72 @@
8484
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8585
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8686
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
8887
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
92-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
9391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
9492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9594
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9695
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9796
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
9897
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
9998
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
102101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
104-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
105103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
106105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
107-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
108-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
109107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
110108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
111109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
112110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
113111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
115112
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
116-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
117113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
118114
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
119115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
116+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
120117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
121118
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
122119
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
123120
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
124121
</content>
125-
<orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
122+
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
126123
<orderEntry type="sourceFolder" forTests="false" />
124+
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
125+
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-25.3.1" level="project" />
126+
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-25.3.1" level="project" />
127+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:25.3.1@jar" level="project" />
127128
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
128-
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-26.1.0" level="project" />
129+
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-25.3.1" level="project" />
129130
<orderEntry type="library" scope="TEST" name="Gradle: javax.annotation:javax.annotation-api:1.2@jar" level="project" />
130-
<orderEntry type="library" name="Gradle: com.android.support:transition-26.1.0" level="project" />
131-
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-26.1.0" level="project" />
132131
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
133-
<orderEntry type="library" name="Gradle: com.android.support:support-fragment-26.1.0" level="project" />
134-
<orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
135132
<orderEntry type="library" scope="TEST" name="Gradle: com.squareup:javawriter:2.1.1@jar" level="project" />
133+
<orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-25.3.1" level="project" />
134+
<orderEntry type="library" name="Gradle: com.android.support:support-compat-25.3.1" level="project" />
136135
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:rules-0.5" level="project" />
137-
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.2" level="project" />
138136
<orderEntry type="library" name="Gradle: com.journeyapps:zxing-android-embedded-3.2.0" level="project" />
139-
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-26.1.0" level="project" />
140-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:26.1.0@jar" level="project" />
141-
<orderEntry type="library" name="Gradle: com.android.support:support-v4-26.1.0" level="project" />
142-
<orderEntry type="library" name="Gradle: com.android.support:support-compat-26.1.0" level="project" />
137+
<orderEntry type="library" name="Gradle: com.android.support:transition-25.3.1" level="project" />
143138
<orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
144-
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-26.1.0" level="project" />
145139
<orderEntry type="library" scope="TEST" name="Gradle: javax.inject:javax.inject:1@jar" level="project" />
140+
<orderEntry type="library" name="Gradle: com.android.support:support-v4-25.3.1" level="project" />
146141
<orderEntry type="library" name="Gradle: com.google.zxing:core:3.2.1@jar" level="project" />
142+
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.0.2" level="project" />
147143
<orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12@jar" level="project" />
148-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
149144
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3@jar" level="project" />
150-
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-26.1.0" level="project" />
151-
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-26.1.0" level="project" />
145+
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-25.3.1" level="project" />
152146
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:runner-0.5" level="project" />
153-
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-26.1.0" level="project" />
154-
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.2@jar" level="project" />
155147
<orderEntry type="library" scope="TEST" name="Gradle: com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
156148
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-library:1.3@jar" level="project" />
157149
<orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
158-
<orderEntry type="library" name="Gradle: com.android.support:design-26.1.0" level="project" />
159-
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
150+
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-25.3.1" level="project" />
151+
<orderEntry type="library" name="Gradle: com.android.support:design-25.3.1" level="project" />
152+
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-25.3.1" level="project" />
153+
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-25.3.1" level="project" />
160154
</component>
161155
</module>

‎app/build.gradle‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 26
5-
buildToolsVersion '28.0.3'
4+
compileSdkVersion 25
5+
buildToolsVersion '26.0.2'
66
defaultConfig {
77
applicationId "de.t_dankworth.secscanqr"
88
minSdkVersion 17
9-
targetSdkVersion 26
10-
versionCode 11
11-
versionName "1.1.8"
9+
targetSdkVersion 23
10+
versionCode 12
11+
versionName "1.1.9"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1313
vectorDrawables.useSupportLibrary = true
1414
}
@@ -28,12 +28,13 @@ dependencies {
2828
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
2929
exclude group: 'com.android.support', module: 'support-annotations'
3030
})
31-
implementation 'com.android.support:appcompat-v7:26.1.0'
32-
implementation 'com.android.support:design:26.1.0'
33-
implementation 'com.android.support:support-vector-drawable:26.1.0'
31+
implementation 'com.android.support:appcompat-v7:25.3.1'
32+
implementation 'com.android.support:design:25.3.1'
33+
implementation 'com.android.support:support-vector-drawable:25.3.1'
3434
implementation 'com.google.zxing:core:3.2.1'
3535
implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
36-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
37-
implementation 'com.android.support:support-v4:26.1.0'
36+
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
37+
implementation 'com.android.support:support-v4:25.3.1'
3838
testImplementation 'junit:junit:4.12'
39+
3940
}

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.0.1'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

‎local.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
## This file must *NOT* be checked into Version Control Systems,
2-
# as it contains information specific to your local configuration.
3-
#
4-
# Location of the SDK. This is only used by Gradle.
5-
# For customization when using a Version Control System, please read the
6-
# header note.
7-
#Sat Jul 07 20:57:43 CEST 2018
8-
sdk.dir=D\:\\Android\\SDK
1+
## This file must *NOT* be checked into Version Control Systems,
2+
# as it contains information specific to your local configuration.
3+
#
4+
# Location of the SDK. This is only used by Gradle.
5+
# For customization when using a Version Control System, please read the
6+
# header note.
7+
#Sun Nov 11 16:49:15 CET 2018
8+
sdk.dir=/home/thore/Android/Sdk

0 commit comments

Comments
 (0)