合并

@@ -11,12 +11,12 @@ if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 }
 
 
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+def flutterVersionCode = "121"
 if (flutterVersionCode == null) {
 if (flutterVersionCode == null) {
     flutterVersionCode = '121'
     flutterVersionCode = '121'
 }
 }
 
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = "1.2.1"
 if (flutterVersionName == null) {
 if (flutterVersionName == null) {
     flutterVersionName = '1.2.1'
     flutterVersionName = '1.2.1'
 }
 }
@@ -43,8 +43,8 @@ android {
         applicationId "com.naji.one_key"
         applicationId "com.naji.one_key"
         minSdkVersion 21
         minSdkVersion 21
         targetSdkVersion 28
         targetSdkVersion 28
-        versionCode 118
-        versionName "1.1.8"
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
 
         ndk {
         ndk {