Skip to content

Commit 1733598

Browse files
authored
chore(app_check): upgrade gradle (#12880)
1 parent c63a282 commit 1733598

File tree

13 files changed

+269
-130
lines changed

13 files changed

+269
-130
lines changed

packages/firebase_app_check/firebase_app_check/example/.metadata

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,27 @@
44
# This file should be version controlled and should not be manually edited.
55

66
version:
7-
revision: adc687823a831bbebe28bdccfac1a628ca621513
8-
channel: stable
7+
revision: "5dcb86f68f239346676ceb1ed1ea385bd215fba1"
8+
channel: "stable"
99

1010
project_type: app
11+
12+
# Tracks metadata for the flutter migrate command
13+
migration:
14+
platforms:
15+
- platform: root
16+
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
17+
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
18+
- platform: android
19+
create_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
20+
base_revision: 5dcb86f68f239346676ceb1ed1ea385bd215fba1
21+
22+
# User provided section
23+
24+
# List of Local paths (relative to this file) that should be
25+
# ignored by the migrate tool.
26+
#
27+
# Files that are not part of the templates will be ignored by default.
28+
unmanaged_files:
29+
- 'lib/main.dart'
30+
- 'ios/Runner.xcodeproj/project.pbxproj'

packages/firebase_app_check/firebase_app_check/example/android/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ GeneratedPluginRegistrant.java
99
# Remember to never publicly share your keystore.
1010
# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
1111
key.properties
12+
**/*.keystore
13+
**/*.jks
Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,60 @@
1+
plugins {
2+
id "com.android.application"
3+
// START: FlutterFire Configuration
4+
id 'com.google.gms.google-services'
5+
// END: FlutterFire Configuration
6+
id "kotlin-android"
7+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
8+
id "dev.flutter.flutter-gradle-plugin"
9+
}
10+
111
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
12+
def localPropertiesFile = rootProject.file("local.properties")
313
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
14+
localPropertiesFile.withReader("UTF-8") { reader ->
515
localProperties.load(reader)
616
}
717
}
818

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-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
19+
def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
1520
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
21+
flutterVersionCode = "1"
1722
}
1823

19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
24+
def flutterVersionName = localProperties.getProperty("flutter.versionName")
2025
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
26+
flutterVersionName = "1.0"
2227
}
2328

24-
apply plugin: 'com.android.application'
25-
// START: FlutterFire Configuration
26-
apply plugin: 'com.google.gms.google-services'
27-
// END: FlutterFire Configuration
28-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
29-
3029
android {
31-
namespace "io.flutter.plugins.firebase.appcheck.example"
32-
33-
compileSdk 34
30+
namespace = "io.flutter.plugins.firebase.appcheck.example"
31+
compileSdk = flutter.compileSdkVersion
32+
ndkVersion = flutter.ndkVersion
3433

35-
defaultConfig {
36-
applicationId "io.flutter.plugins.firebase.appcheck.example"
37-
minSdk 21
38-
targetSdk 33
39-
versionCode flutterVersionCode.toInteger()
40-
versionName flutterVersionName
34+
compileOptions {
35+
sourceCompatibility = JavaVersion.VERSION_1_8
36+
targetCompatibility = JavaVersion.VERSION_1_8
4137
}
4238

43-
buildFeatures {
44-
buildConfig true
39+
defaultConfig {
40+
applicationId = "io.flutter.plugins.firebase.appcheck.example"
41+
// You can update the following values to match your application needs.
42+
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
43+
minSdk = flutter.minSdkVersion
44+
targetSdk = flutter.targetSdkVersion
45+
versionCode = flutterVersionCode.toInteger()
46+
versionName = flutterVersionName
4547
}
4648

4749
buildTypes {
4850
release {
4951
// TODO: Add your own signing config for the release build.
5052
// Signing with the debug keys for now, so `flutter run --release` works.
51-
signingConfig signingConfigs.debug
53+
signingConfig = signingConfigs.debug
5254
}
5355
}
5456
}
5557

5658
flutter {
57-
source '../..'
59+
source = "../.."
5860
}

0 commit comments

Comments
 (0)