diff --git a/SecScanQR-master.iml b/SecScanQR-master.iml index 006dc599..e529adc5 100644 --- a/SecScanQR-master.iml +++ b/SecScanQR-master.iml @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index 50e824ff..bdeb3da2 100644 --- a/app/app.iml +++ b/app/app.iml @@ -23,19 +23,19 @@ - - + + - + - + @@ -84,78 +84,72 @@ - + - - + - - + + - - + + - - + - - + - + + + + + - + - - - - + + - - - - - + - + + - - - + - - - - + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7e63fdb4..acadf437 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 - buildToolsVersion '28.0.3' + compileSdkVersion 25 + buildToolsVersion '26.0.2' defaultConfig { applicationId "de.t_dankworth.secscanqr" minSdkVersion 17 - targetSdkVersion 26 - versionCode 11 - versionName "1.1.8" + targetSdkVersion 23 + versionCode 12 + versionName "1.1.9" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } @@ -28,12 +28,13 @@ dependencies { androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:design:26.1.0' - implementation 'com.android.support:support-vector-drawable:26.1.0' + implementation 'com.android.support:appcompat-v7:25.3.1' + implementation 'com.android.support:design:25.3.1' + implementation 'com.android.support:support-vector-drawable:25.3.1' implementation 'com.google.zxing:core:3.2.1' implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar' - implementation 'com.android.support.constraint:constraint-layout:1.1.2' - implementation 'com.android.support:support-v4:26.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.0.2' + implementation 'com.android.support:support-v4:25.3.1' testImplementation 'junit:junit:4.12' + } diff --git a/build.gradle b/build.gradle index 0dd5ade6..833e3b3a 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/local.properties b/local.properties index 562fc1d3..9ea6322a 100644 --- a/local.properties +++ b/local.properties @@ -1,8 +1,8 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Sat Jul 07 20:57:43 CEST 2018 -sdk.dir=D\:\\Android\\SDK +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Sun Nov 11 16:49:15 CET 2018 +sdk.dir=/home/thore/Android/Sdk