diff --git a/examples/flutter_view/android/app/build.gradle b/examples/flutter_view/android/app/build.gradle index 7113ce5458..7c18e6456f 100644 --- a/examples/flutter_view/android/app/build.gradle +++ b/examples/flutter_view/android/app/build.gradle @@ -7,24 +7,6 @@ plugins { id "dev.flutter.flutter-gradle-plugin" } -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - android { namespace "com.example.view" compileSdk flutter.compileSdkVersion @@ -38,8 +20,8 @@ android { applicationId "io.flutter.examples.flutter_view" minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName + versionCode flutter.versionCode + versionName flutter.versionName } buildTypes { diff --git a/examples/hello_world/android/app/build.gradle.kts b/examples/hello_world/android/app/build.gradle.kts index 6732ca6873..175e23095a 100644 --- a/examples/hello_world/android/app/build.gradle.kts +++ b/examples/hello_world/android/app/build.gradle.kts @@ -20,8 +20,8 @@ android { applicationId = "io.flutter.examples.hello_world" minSdk = flutter.minSdkVersion targetSdk = flutter.targetSdkVersion - versionCode = flutter.versionCode() - versionName = flutter.versionName() + versionCode = flutter.versionCode + versionName = flutter.versionName } buildTypes { diff --git a/examples/layers/android/app/build.gradle b/examples/layers/android/app/build.gradle index 185bafc025..87d5fd2ee6 100644 --- a/examples/layers/android/app/build.gradle +++ b/examples/layers/android/app/build.gradle @@ -20,8 +20,8 @@ android { applicationId "io.flutter.examples.layers" minSdkVersion flutter.minSdkVersion targetSdkVersion flutter.targetSdkVersion - versionCode flutter.versionCode() - versionName flutter.versionName() + versionCode flutter.versionCode + versionName flutter.versionName } buildTypes { diff --git a/packages/flutter_tools/gradle/src/main/groovy/app_plugin_loader.groovy b/packages/flutter_tools/gradle/src/main/groovy/app_plugin_loader.groovy index 16965213df..0a03e26999 100644 --- a/packages/flutter_tools/gradle/src/main/groovy/app_plugin_loader.groovy +++ b/packages/flutter_tools/gradle/src/main/groovy/app_plugin_loader.groovy @@ -17,7 +17,7 @@ class FlutterAppPluginLoaderPlugin implements Plugin { settings.ext.flutterSdkPath = properties.getProperty("flutter.sdk") assert settings.ext.flutterSdkPath != null, "flutter.sdk not set in local.properties" } - + // Load shared gradle functions settings.apply from: Paths.get(settings.ext.flutterSdkPath, "packages", "flutter_tools", "gradle", "src", "main", "groovy", "native_plugin_loader.groovy") diff --git a/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy b/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy index 178d61dcce..5f191fe8b0 100644 --- a/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy +++ b/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy @@ -78,7 +78,7 @@ class FlutterExtension { public String flutterVersionName = null /** Returns flutterVersionCode as an integer with error handling. */ - public Integer versionCode() { + public Integer getVersionCode() { if (flutterVersionCode == null) { throw new GradleException("flutterVersionCode must not be null.") } @@ -91,7 +91,7 @@ class FlutterExtension { } /** Returns flutterVersionName with error handling. */ - public String versionName() { + public String getVersionName() { if (flutterVersionName == null) { throw new GradleException("flutterVersionName must not be null.") }