Skip to content

Commit 09b4f6b

Browse files
committed
Clean-up, upgrade build.gradle's
1 parent f59a16a commit 09b4f6b

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

analysis_options.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ analyzer:
55
# Ignore generated files
66
- '**/*.g.dart'
77
- 'lib/src/generated/*.dart'
8-
98
linter:
109
rules:
1110
- public_member_api_docs

android/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,30 @@ version '1.0-SNAPSHOT'
44
buildscript {
55
repositories {
66
google()
7-
jcenter()
7+
mavenCentral()
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:3.6.1'
11+
classpath 'com.android.tools.build:gradle:4.1.0'
1212
}
1313
}
1414

1515
rootProject.allprojects {
1616
repositories {
1717
google()
18-
jcenter()
18+
mavenCentral()
1919
}
2020
}
2121

2222
apply plugin: 'com.android.library'
2323

2424
android {
25-
compileSdkVersion 28
25+
compileSdkVersion 31
26+
27+
compileOptions {
28+
sourceCompatibility JavaVersion.VERSION_1_8
29+
targetCompatibility JavaVersion.VERSION_1_8
30+
}
2631

2732
defaultConfig {
2833
minSdkVersion 16

example/android/app/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ apply plugin: 'com.android.application'
2525
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2626

2727
android {
28-
compileSdkVersion 31
28+
compileSdkVersion flutter.compileSdkVersion
29+
30+
compileOptions {
31+
sourceCompatibility JavaVersion.VERSION_1_8
32+
targetCompatibility JavaVersion.VERSION_1_8
33+
}
2934

3035
lintOptions {
3136
disable 'InvalidPackage'
@@ -34,8 +39,8 @@ android {
3439
defaultConfig {
3540
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3641
applicationId "com.baseflow.googleapiavailabilityexample"
37-
minSdkVersion 16
38-
targetSdkVersion 31
42+
minSdkVersion flutter.minSdkVersion
43+
targetSdkVersion flutter.targetSdkVersion
3944
versionCode flutterVersionCode.toInteger()
4045
versionName flutterVersionName
4146
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

example/android/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
buildscript {
22
repositories {
33
google()
4-
jcenter()
4+
mavenCentral()
55
}
66

77
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.6.1'
8+
classpath 'com.android.tools.build:gradle:4.1.0'
99
}
1010
}
1111

1212
allprojects {
1313
repositories {
1414
google()
15-
jcenter()
15+
mavenCentral()
1616
}
1717
}
1818

example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

0 commit comments

Comments
 (0)