diff --git a/android/app/build.gradle b/android/app/build.gradle index 1032764..d95bf24 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -16,15 +16,15 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 - buildToolsVersion '27.0.3' + compileSdkVersion 29 + buildToolsVersion '29.0.2' lintOptions { disable 'InvalidPackage' } defaultConfig { - targetSdkVersion 27 + targetSdkVersion 29 minSdkVersion 16 applicationId "com.dinect.checker" } @@ -200,10 +200,10 @@ flutter { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:support-v4:27.1.1' - implementation 'com.android.support:support-media-compat:27.1.1' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'androidx.media:media:1.1.0' implementation 'com.squareup.okhttp3:okhttp:3.9.0' implementation 'com.squareup.okio:okio:1.13.0' implementation 'me.dm7.barcodescanner:zxing:1.9.8' diff --git a/android/app/src/main/java/com/dinect/checker/MainActivity.java b/android/app/src/main/java/com/dinect/checker/MainActivity.java index be9a587..2681e25 100644 --- a/android/app/src/main/java/com/dinect/checker/MainActivity.java +++ b/android/app/src/main/java/com/dinect/checker/MainActivity.java @@ -10,8 +10,8 @@ import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.Bundle; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.widget.Toast; import java.util.ArrayList; diff --git a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java index fe784b1..e6a3814 100644 --- a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java +++ b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java @@ -19,12 +19,12 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/android/app/src/main/res/layout/v_custom_toolbar.xml b/android/app/src/main/res/layout/v_custom_toolbar.xml index 9a6c187..ae5065a 100644 --- a/android/app/src/main/res/layout/v_custom_toolbar.xml +++ b/android/app/src/main/res/layout/v_custom_toolbar.xml @@ -1,5 +1,5 @@ - - + diff --git a/android/build.gradle b/android/build.gradle index a2b6e7a..581b100 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.40' + ext.kotlin_version = '1.3.61' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.1' + classpath 'com.android.tools.build:gradle:3.4.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -17,17 +17,3 @@ allprojects { jcenter() } } - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" - project.evaluationDependsOn(':app') -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - -task wrapper(type: Wrapper) { - gradleVersion = '2.14.1' -} diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..53ae0ae 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,3 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/pubspec.lock b/pubspec.lock index fd4a58b..ba1a54a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -22,6 +22,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.14.11" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + dart2_constant: + dependency: transitive + description: + name: dart2_constant + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.2+dart2" flutter: dependency: "direct main" description: flutter @@ -33,7 +47,7 @@ packages: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.12.0" + version: "0.12.0+4" http_parser: dependency: transitive description: @@ -47,14 +61,21 @@ packages: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.4.10" + version: "0.6.1+11" intl: dependency: "direct main" description: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.15.7" + version: "0.16.1" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.6" meta: dependency: transitive description: @@ -75,21 +96,42 @@ packages: name: path_provider url: "https://pub.dartlang.org" source: hosted - version: "0.4.1" + version: "1.4.5" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.0" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "2.4.0" + platform: + dependency: transitive + description: + name: platform + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + quiver: + dependency: transitive + description: + name: quiver + url: "https://pub.dartlang.org" + source: hosted + version: "0.29.0+2" sentry: dependency: "direct main" description: name: sentry url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.0.1" sky_engine: dependency: transitive description: flutter @@ -108,14 +150,14 @@ packages: name: sprintf url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.2" sqflite: dependency: "direct main" description: name: sqflite url: "https://pub.dartlang.org" source: hosted - version: "0.12.2+1" + version: "1.1.8" stack_trace: dependency: transitive description: @@ -136,7 +178,7 @@ packages: name: synchronized url: "https://pub.dartlang.org" source: hosted - version: "1.5.3" + version: "2.1.1" typed_data: dependency: transitive description: @@ -164,7 +206,7 @@ packages: name: xml url: "https://pub.dartlang.org" source: hosted - version: "3.2.3" + version: "3.5.0" sdks: - dart: ">=2.2.2 <3.0.0" - flutter: ">=0.1.4 <2.0.0" + dart: ">=2.5.0 <3.0.0" + flutter: ">=1.9.1+hotfix.5 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index ecb8afa..d97fa6c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -2,14 +2,14 @@ name: checker description: A new Flutter project. dependencies: - http: '>=0.11.3+12' - sprintf: "4.0.0" - path_provider: "0.4.1" - sqflite: "0.12.2+1" - image_picker: '^0.4.1' # use for ask permissions @ iOS - xml: "^3.0.0" - sentry: 2.2.0 - intl: 0.15.7 + http: '0.12.0+4' + sprintf: "4.0.2" + path_provider: "1.4.5" + sqflite: "1.1.8" + image_picker: '0.6.1+11' # use for ask permissions @ iOS + xml: "3.5.0" + sentry: 2.0.1 + intl: 0.16.1 flutter: sdk: flutter