Skip to content

Commit eca6ed1

Browse files
authored
Updated Android Dependency of Flatbuffers from 1.9 to 1.12 (#439)
Flatbuffers 1.9 caused compilation errors on the latest XCode command line tools (clang v12) when building for Android. Upgraded flatbuffers dependency from 1.9 => 1.12 Tests: [Android Integration Test Run](https://github.com/firebase/firebase-cpp-sdk/actions/runs/994238075)
1 parent 0775eb6 commit eca6ed1

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def firebaseDependenciesMap = [
3434
'messaging' : ['com.google.firebase:firebase-messaging:22.0.0',
3535
'firebase_cpp_sdk.messaging:messaging_java',
3636
'androidx.core:core:1.6.0-alpha03',
37-
'com.google.flatbuffers:flatbuffers-java:1.9.0',
37+
'com.google.flatbuffers:flatbuffers-java:1.12.0',
3838
'com.google.android.gms:play-services-base:17.6.0'],
3939
'performance' : ['com.google.firebase:firebase-perf:20.0.1'],
4040
'remote_config' : ['com.google.firebase:firebase-config:21.0.0',

messaging/messaging_java/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ buildscript {
2424
// that requires using a newer version of the JDK and at least Android N.
2525
// This has already been fixed at head, but a tagged release is not yet
2626
// available with that fix.
27-
classpath 'com.google.flatbuffers:flatbuffers-java:1.9.0'
27+
classpath 'com.google.flatbuffers:flatbuffers-java:1.12.0'
2828
}
2929
}
3030
allprojects {
@@ -57,7 +57,7 @@ android {
5757
dependencies {
5858
implementation 'com.google.firebase:firebase-analytics:19.0.0'
5959
implementation 'com.google.firebase:firebase-messaging:22.0.0'
60-
implementation 'com.google.flatbuffers:flatbuffers-java:1.9.0'
60+
implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'
6161
}
6262

6363
afterEvaluate {
@@ -74,7 +74,7 @@ afterEvaluate {
7474
executable 'git'
7575
args 'clone',
7676
'--branch',
77-
'v1.10.0',
77+
'v1.12.0',
7878
'--depth',
7979
'1',
8080
'https://github.com/google/flatbuffers.git',

release_build_files/Android/firebase_dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def firebaseDependenciesMap = [
3434
'messaging' : ['com.google.firebase:firebase-messaging:22.0.0',
3535
'com.google.firebase.messaging.cpp:firebase_messaging_cpp@aar',
3636
'androidx.core:core:1.6.0-alpha03',
37-
'com.google.flatbuffers:flatbuffers-java:1.9.0',
37+
'com.google.flatbuffers:flatbuffers-java:1.12.0',
3838
'com.google.android.gms:play-services-base:17.6.0'],
3939
'performance' : ['com.google.firebase:firebase-perf:20.0.1'],
4040
'remote_config' : ['com.google.firebase:firebase-config:21.0.0',

release_build_files/readme.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,11 @@ code.
567567

568568
## Release Notes
569569

570+
### 8.2.0
571+
- Changes
572+
- General (Android): Updated Flatbuffers internal dependency from version
573+
1.9 to 1.12.
574+
570575
### 8.1.0
571576
- Changes
572577
- Firestore: Fixed a linker error when `DocumentChange::npos` was used.

testing/build.gradle

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,7 @@ buildscript {
2020
dependencies {
2121
classpath 'com.android.tools.build:gradle:3.3.3'
2222
classpath 'com.google.gms:google-services:4.2.0'
23-
// This uses Flatbuffers at 1.9 because the 1.10 version added a feature
24-
// that requires using a newer version of the JDK and at least Android N.
25-
// This has already been fixed at head, but a tagged release is not yet
26-
// available with that fix.
27-
classpath 'com.google.flatbuffers:flatbuffers-java:1.9.0'
23+
classpath 'com.google.flatbuffers:flatbuffers-java:1.12.0'
2824
}
2925
}
3026

@@ -71,7 +67,7 @@ android {
7167
}
7268

7369
dependencies {
74-
implementation 'com.google.flatbuffers:flatbuffers-java:1.9.0'
70+
implementation 'com.google.flatbuffers:flatbuffers-java:1.12.0'
7571
}
7672

7773
afterEvaluate { project ->

0 commit comments

Comments
 (0)