| @@ -2,14 +2,14 @@ group 'net.touchcapture.qr.flutterqr' | |||||
| version '1.0-SNAPSHOT' | version '1.0-SNAPSHOT' | ||||
| buildscript { | buildscript { | ||||
| ext.kotlin_version = '1.3.21' | |||||
| ext.kotlin_version = '1.4.21' | |||||
| repositories { | repositories { | ||||
| google() | google() | ||||
| jcenter() | jcenter() | ||||
| } | } | ||||
| dependencies { | dependencies { | ||||
| classpath 'com.android.tools.build:gradle:3.3.2' | |||||
| classpath 'com.android.tools.build:gradle:4.1.1' | |||||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||||
| } | } | ||||
| } | } | ||||
| @@ -27,7 +27,7 @@ apply plugin: 'kotlin-android-extensions' | |||||
| apply plugin: 'kotlin-kapt' | apply plugin: 'kotlin-kapt' | ||||
| android { | android { | ||||
| compileSdkVersion 28 | |||||
| compileSdkVersion 30 | |||||
| sourceSets { | sourceSets { | ||||
| @@ -48,6 +48,6 @@ android { | |||||
| dependencies { | dependencies { | ||||
| implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | ||||
| implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } | implementation('com.journeyapps:zxing-android-embedded:4.1.0') { transitive = false } | ||||
| implementation 'androidx.appcompat:appcompat:1.0.2' | |||||
| implementation 'androidx.appcompat:appcompat:1.2.0' | |||||
| implementation 'com.google.zxing:core:3.3.0' | implementation 'com.google.zxing:core:3.3.0' | ||||
| } | } | ||||
| @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' | |||||
| apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" | apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" | ||||
| android { | android { | ||||
| compileSdkVersion 28 | |||||
| compileSdkVersion 30 | |||||
| sourceSets { | sourceSets { | ||||
| main.java.srcDirs += 'src/main/kotlin' | main.java.srcDirs += 'src/main/kotlin' | ||||
| @@ -37,10 +37,9 @@ android { | |||||
| } | } | ||||
| defaultConfig { | defaultConfig { | ||||
| // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). | |||||
| applicationId "net.touchcapture.qr.flutterqrexample" | applicationId "net.touchcapture.qr.flutterqrexample" | ||||
| minSdkVersion 19 | minSdkVersion 19 | ||||
| targetSdkVersion 27 | |||||
| targetSdkVersion 30 | |||||
| versionCode flutterVersionCode.toInteger() | versionCode flutterVersionCode.toInteger() | ||||
| versionName flutterVersionName | versionName flutterVersionName | ||||
| testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" | testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" | ||||
| @@ -48,7 +47,6 @@ android { | |||||
| buildTypes { | buildTypes { | ||||
| release { | release { | ||||
| // TODO: Add your own signing config for the release build. | |||||
| // Signing with the debug keys for now, so `flutter run --release` works. | // Signing with the debug keys for now, so `flutter run --release` works. | ||||
| signingConfig signingConfigs.debug | signingConfig signingConfigs.debug | ||||
| } | } | ||||
| @@ -61,7 +59,7 @@ flutter { | |||||
| dependencies { | dependencies { | ||||
| implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" | ||||
| testImplementation 'junit:junit:4.12' | |||||
| testImplementation 'junit:junit:4.13.1' | |||||
| androidTestImplementation 'com.android.support.test:runner:1.0.2' | androidTestImplementation 'com.android.support.test:runner:1.0.2' | ||||
| androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' | androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' | ||||
| } | } | ||||
| @@ -1,12 +1,12 @@ | |||||
| buildscript { | buildscript { | ||||
| ext.kotlin_version = '1.3.50' | |||||
| ext.kotlin_version = '1.4.21' | |||||
| repositories { | repositories { | ||||
| google() | google() | ||||
| jcenter() | jcenter() | ||||
| } | } | ||||
| dependencies { | dependencies { | ||||
| classpath 'com.android.tools.build:gradle:3.6.3' | |||||
| classpath 'com.android.tools.build:gradle:4.1.1' | |||||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | ||||
| } | } | ||||
| } | } | ||||
| @@ -1,6 +1,6 @@ | |||||
| #Thu May 14 12:19:05 CEST 2020 | |||||
| #Thu Dec 10 21:49:57 CET 2020 | |||||
| distributionBase=GRADLE_USER_HOME | distributionBase=GRADLE_USER_HOME | ||||
| distributionPath=wrapper/dists | distributionPath=wrapper/dists | ||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip | |||||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip | |||||