Skip to content

Commit 06f4498

Browse files
committed
fix: change path of global-config
1 parent 8b15b09 commit 06f4498

5 files changed

Lines changed: 24 additions & 33 deletions

File tree

packages/firebase_core/firebase_core/android/global-config.gradle renamed to gradle/global-config.gradle

File renamed without changes.

packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/firebase_data_connect/firebase_data_connect/example/android/app/generated_android_versions.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,6 @@
1-
def versionFile = file("generated_android_versions.txt")
2-
def versionProps = new Properties()
3-
4-
if (versionFile.exists()) {
5-
versionFile.withInputStream { stream ->
6-
versionProps.load(stream)
7-
}
8-
} else {
9-
throw new GradleException("generated_android_versions.txt not found!")
10-
}
11-
121
ext {
13-
compileSdk = versionProps['compileSdk'] as Integer
14-
minSdk = versionProps['minSdk'] as Integer
15-
targetSdk = versionProps['targetSdk'] as Integer
16-
17-
def javaVerNum = versionProps['javaVersion'] as Integer
18-
javaVersion = JavaVersion.toVersion(javaVerNum)
19-
}
2+
compileSdk=35
3+
minSdk=21
4+
targetSdk=35
5+
javaVersion = JavaVersion.toVersion(17)
6+
}

scripts/generate_versions_gradle.dart

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'package:melos/melos.dart' as melos;
1616
import 'package:glob/glob.dart';
1717
import 'dart:io';
1818
import 'package:cli_util/cli_logging.dart' as logging;
19-
import 'package:path/path.dart' as path;
19+
import 'package:path/path.dart' show joinAll;
2020

2121
// Used to generate a simple txt file for local-config.gradle files to parse in order to use correct java and compilation versions.
2222

@@ -25,12 +25,15 @@ void main() async {
2525
// get version from core
2626
// To edit versions for all packages, edit the global-config.txt file in firebase_core package
2727
// located in the android folder for global-config.txt
28-
final firebaseCorePackage = workspace.filteredPackages.values
29-
.firstWhere((package) => package.name == 'firebase_core');
30-
31-
final globalConfig = File(
32-
'${firebaseCorePackage.path}/android/global-config.gradle',
28+
final globalConfigPath = joinAll(
29+
[
30+
Directory.current.path,
31+
'gradle',
32+
'global-config.gradle',
33+
],
3334
);
35+
36+
final globalConfig = File(globalConfigPath);
3437

3538
if (!globalConfig.existsSync()) {
3639
throw Exception(
@@ -40,7 +43,16 @@ void main() async {
4043

4144
for (final package in workspace.filteredPackages.values) {
4245
// Skip firebase_data_connect and firebase_vertexai packages as they do not have gradle in them.
43-
if (package.name == 'firebase_data_connect' || package.name == 'firebase_vertexai') {
46+
if (package.name == 'firebase_vertexai') {
47+
continue;
48+
}
49+
else if (package.name == 'firebase_data_connect') {
50+
final localConfigGradleFilePath = '${package.path}/example/android/app/local-config.gradle';
51+
final copiedConfig = await globalConfig.copy(
52+
localConfigGradleFilePath,
53+
);
54+
// ignore: avoid_print
55+
print('File copied to: ${copiedConfig.path}');
4456
continue;
4557
}
4658
else {

0 commit comments

Comments
 (0)