Skip to content

Commit a807a3e

Browse files
wu-huiwu-hui
authored
Fix integration tests settings.gradle (#1105)
* fix gitignore * Fix settings.gradle * Add empty lines
1 parent afa0cdd commit a807a3e

File tree

15 files changed

+62
-42
lines changed

15 files changed

+62
-42
lines changed

‎.gitignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,23 @@ testing/test_framework/external/
2424

2525
# XCode user specific folders
2626
**/xcuserdata/
27+
28+
# Local gradle properties
29+
**/local.properties
30+
31+
# Auto generated files for firestore internal tests
32+
firestore/integration_test_internal/download_googletest.py
33+
firestore/integration_test_internal/external
34+
firestore/integration_test_internal/src/android/android_app_framework.cc
35+
firestore/integration_test_internal/src/android/android_firebase_test_framework.cc
36+
firestore/integration_test_internal/src/app_framework.cc
37+
firestore/integration_test_internal/src/app_framework.h
38+
firestore/integration_test_internal/src/desktop/desktop_app_framework.cc
39+
firestore/integration_test_internal/src/desktop/desktop_firebase_test_framework.cc
40+
firestore/integration_test_internal/src/empty.swift
41+
firestore/integration_test_internal/src/firebase_test_framework.cc
42+
firestore/integration_test_internal/src/firebase_test_framework.h
43+
firestore/integration_test_internal/src/ios/ios_app_framework.mm
44+
firestore/integration_test_internal/src/ios/ios_firebase_test_framework.mm
45+
firestore/integration_test_internal/src/ios/.clang-format
46+
firestore/integration_test_internal/src/android/java/com/google/firebase/example

‎admob/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎analytics/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎app/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎auth/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎database/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎dynamic_links/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎firestore/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎firestore/integration_test_internal/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

‎functions/integration_test/settings.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ def firebase_cpp_sdk_dir = System.getProperty('firebase_cpp_sdk.dir')
1616
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
1717
firebase_cpp_sdk_dir = System.getenv('FIREBASE_CPP_SDK_DIR')
1818
if (firebase_cpp_sdk_dir == null || firebase_cpp_sdk_dir.isEmpty()) {
19-
if ((new File('../../cpp_sdk_version.json')).exists()) {
20-
firebase_cpp_sdk_dir = new File('../..').absolutePath
19+
if ((file('../../cpp_sdk_version.json')).exists()) {
20+
firebase_cpp_sdk_dir = file('../..').absolutePath
2121
}
22-
else if ((new File('firebase_cpp_sdk')).exists()) {
22+
else if ((file('firebase_cpp_sdk')).exists()) {
2323
firebase_cpp_sdk_dir = 'firebase_cpp_sdk'
2424
} else {
2525
throw new StopActionException(

0 commit comments

Comments
 (0)