diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..a691ddb --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,13 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "Flutter", + "request": "launch", + "type": "dart" + } + ] +} diff --git a/android/app/build.gradle b/android/app/build.gradle index 10b08c3..021a41a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,11 +34,11 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.finogeeks.mopDemo" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -56,6 +56,6 @@ flutter { dependencies { testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0' } diff --git a/android/build.gradle b/android/build.gradle index bb8a303..54cc966 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.4.0' } } diff --git a/android/gradle.properties b/android/gradle.properties index 2bd6f4f..bb04111 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,2 +1,4 @@ +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536M diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 2819f02..63ab3ae 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 2ff41af..7ce58a9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,7 +1,7 @@ PODS: - FinApplet (2.0.190) - Flutter (1.0.0) - - mop (0.0.1): + - mop (0.1.0): - FinApplet (= 2.0.190) - Flutter @@ -22,7 +22,7 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: FinApplet: e9ee3e4202202fe6f1945b6dec0210948932d788 Flutter: 0e3d915762c693b495b44d77113d4970485de6ec - mop: ef04568ea966bf37ec349856270de4b6f9c47173 + mop: f431fed467eb823b21abfa654860d8d3e115118a PODFILE CHECKSUM: b66559db98de00d11e349a06f9e603856ed75d6e diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/pubspec.lock b/pubspec.lock index 6231f12..1eb31ba 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -66,7 +66,7 @@ packages: name: mop url: "https://pub.flutter-io.cn" source: hosted - version: "0.1.0" + version: "0.1.1" path: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 56a8eb1..2b6030e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 - mop: ^0.1.0 + mop: ^0.1.1 dev_dependencies: flutter_test: