Skip to content

Commit 1a90e4a

Browse files
committed
Migrates away from Android imperative gradle api
1 parent 17931df commit 1a90e4a

File tree

4 files changed

+29
-33
lines changed

4 files changed

+29
-33
lines changed

geolocator/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## 13.0.2
22

3-
- Updates dependency on geolocator_apple to version 2.3.8
3+
- Updates dependency on geolocator_apple to version 2.3.8.
4+
- Migrates Android configuration of example app away from imperative gradle API.
45

56
## 13.0.1
67

geolocator/example/android/app/build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
plugins {
2+
id "com.android.application"
3+
id "dev.flutter.flutter-gradle-plugin"
4+
}
5+
16
def localProperties = new Properties()
27
def localPropertiesFile = rootProject.file('local.properties')
38
if (localPropertiesFile.exists()) {
@@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) {
611
}
712
}
813

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1414
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1515
if (flutterVersionCode == null) {
1616
flutterVersionCode = '1'
@@ -27,17 +27,14 @@ project.getTasks().withType(JavaCompile) {
2727
options.compilerArgs.addAll(args)
2828
}
2929

30-
apply plugin: 'com.android.application'
31-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
32-
3330
android {
34-
compileSdkVersion 33
31+
compileSdkVersion 34
3532

3633

3734
defaultConfig {
3835
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3936
applicationId "com.baseflow.geolocator_example"
40-
minSdkVersion 16
37+
minSdkVersion flutter.minSdkVersion
4138
targetSdkVersion 30
4239
versionCode flutterVersionCode.toInteger()
4340
versionName flutterVersionName
Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
}
6-
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.1.2'
9-
}
10-
}
11-
121
allprojects {
132
repositories {
143
google()
@@ -24,6 +13,6 @@ subprojects {
2413
project.evaluationDependsOn(':app')
2514
}
2615

27-
task clean(type: Delete) {
16+
tasks.register("clean", Delete) {
2817
delete rootProject.buildDir
2918
}
Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
411

5-
def plugins = new Properties()
6-
def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
7-
if (pluginsFile.exists()) {
8-
pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
917
}
1018

11-
plugins.each { name, path ->
12-
def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
13-
include ":$name"
14-
project(":$name").projectDir = pluginDirectory
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21+
id "com.android.application" version "7.1.2" apply false
1522
}
23+
24+
include ":app"

0 commit comments

Comments
 (0)