Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(app)!: ios-sdk 10.25.0 (Xcode 15.2+) / android-sdk 33 (minSdk21 + 23 for auth / compileSdk 34+) #7774

Merged
merged 8 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .spellcheck.dict.txt
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ v5
v6
v7
v9
Ventura
VPN
VSCode
Wix
Expand Down
2 changes: 1 addition & 1 deletion docs/app-distribution/usage/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Add the plugin to your `/android/build.gradle` file as a dependency:
buildscript {
dependencies {
// ...
classpath 'com.google.firebase:firebase-appdistribution-gradle:4.2.0'
classpath 'com.google.firebase:firebase-appdistribution-gradle:5.0.0'
}
```

Expand Down
2 changes: 1 addition & 1 deletion docs/crashlytics/android-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ buildscript {
// ..
dependencies {
// ..
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.0'
}
// ..
}
Expand Down
10 changes: 5 additions & 5 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ If you do not meet these prerequisites, follow the links below:
- [React Native - Setting up the development environment](https://reactnative.dev/docs/environment-setup)
- [Create a new Firebase project](https://console.firebase.google.com/)

Additionally, current versions of firebase-ios-sdk have a minimum Xcode requirement of 14.1, which implies a minimum macOS version of 12.5 (macOS Monterey).
Additionally, current versions of firebase-ios-sdk have a minimum Xcode requirement of 15.2, which implies a minimum macOS version of 13.5 (macOS Ventura).

## Installation for React Native CLI projects

Expand Down Expand Up @@ -282,15 +282,15 @@ project.ext {
versions: [
// Overriding Build/Android SDK Versions
android : [
minSdk : 19,
minSdk : 21, // 23+ if using auth module
targetSdk : 33,
compileSdk: 33,
compileSdk: 34,
],

// Overriding Library SDK Versions
firebase: [
// Override Firebase SDK Version
bom : "32.8.1"
bom : "33.0.0"
],
],
])
Expand All @@ -305,7 +305,7 @@ Open your projects `/ios/Podfile` and add any of the globals shown below to the

```ruby
# Override Firebase SDK Version
$FirebaseSDKVersion = '10.24.0'
$FirebaseSDKVersion = '10.25.0'
```

Once changed, reinstall your projects pods via pod install and rebuild your project with `npx react-native run-ios`.
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,30 @@
"format:markdown": "prettier --write \"docs/**/*.md\""
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.24.5",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-private-methods": "^7.18.6",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@babel/plugin-transform-class-properties": "^7.24.1",
"@babel/preset-env": "^7.24.4",
"@babel/preset-env": "^7.24.5",
"@firebase/rules-unit-testing": "^3.0.2",
"@octokit/core": "^5.2.0",
"@tsconfig/node-lts": "^20.1.3",
"@types/react": "^18.2.77",
"@types/react": "^18.3.1",
"@types/react-native": "^0.73.0",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"@typescript-eslint/eslint-plugin": "^7.8.0",
"@typescript-eslint/parser": "^7.8.0",
"babel-jest": "^29.7.0",
"clang-format": "^1.8.0",
"conventional-changelog-cli": "^4.1.0",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-mocha": "^10.4.2",
"eslint-plugin-mocha": "^10.4.3",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-react": "^7.34.1",
"firebase": "^10.11.0",
"firebase-tools": "^13.7.2",
"firebase": "^10.11.1",
"firebase-tools": "^13.8.0",
"genversion": "^3.2.0",
"google-java-format": "^1.3.2",
"inquirer": "^8.2.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/app-check/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/app-check/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"expo": ">=47.0.0"
},
"devDependencies": {
"expo": "^50.0.15"
"expo": "^50.0.18"
},
"peerDependenciesMeta": {
"expo": {
Expand Down
2 changes: 1 addition & 1 deletion packages/app-distribution/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/app/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"superstruct": "^0.6.2"
},
"devDependencies": {
"expo": "^50.0.15"
"expo": "^50.0.18"
},
"peerDependenciesMeta": {
"expo": {
Expand All @@ -73,19 +73,19 @@
},
"sdkVersions": {
"ios": {
"firebase": "10.24.0",
"firebase": "10.25.0",
"iosTarget": "11.0",
"macosTarget": "10.13"
},
"android": {
"minSdk": 19,
"targetSdk": 33,
"compileSdk": 33,
"firebase": "32.8.1",
"firebaseCrashlyticsGradle": "2.9.9",
"minSdk": 21,
"targetSdk": 34,
"compileSdk": 34,
"firebase": "33.0.0",
"firebaseCrashlyticsGradle": "3.0.0",
"firebasePerfGradle": "1.4.2",
"gmsGoogleServicesGradle": "4.4.1",
"playServicesAuth": "21.0.0"
"playServicesAuth": "21.1.1"
}
}
}
4 changes: 2 additions & 2 deletions packages/auth/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down Expand Up @@ -47,7 +47,7 @@ project.ext {
set('react-native', [
versions: [
android : [
minSdk : jsonMinSdk,
minSdk : 23, // jsonMinSdk, this is temporarily higher than other modules
targetSdk : jsonTargetSdk,
compileSdk: jsonCompileSdk,
],
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"@types/plist": "^3.0.5",
"expo": "^50.0.15"
"expo": "^50.0.18"
},
"peerDependenciesMeta": {
"expo": {
Expand Down
2 changes: 1 addition & 1 deletion packages/crashlytics/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/crashlytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"stacktrace-js": "^2.0.2"
},
"devDependencies": {
"expo": "^50.0.15"
"expo": "^50.0.18"
},
"peerDependenciesMeta": {
"expo": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.0'
classpath("com.android.tools.build:gradle:4.1.0")

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion packages/database/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/dynamic-links/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/dynamic-links/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"expo": ">=47.0.0"
},
"devDependencies": {
"expo": "^50.0.15"
"expo": "^50.0.18"
},
"peerDependenciesMeta": {
"expo": {
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import com.facebook.react.bridge.ReadableMapKeySetIterator;
import com.facebook.react.bridge.WritableArray;
import com.facebook.react.bridge.WritableMap;
import com.google.common.collect.Iterables;
import com.google.firebase.Timestamp;
import com.google.firebase.firestore.Blob;
import com.google.firebase.firestore.DocumentChange;
Expand Down Expand Up @@ -199,10 +198,12 @@ private static WritableArray documentChangesToWritableArray(
boolean isMetadataChange = false;
if (checkIfMetadataChange) {
int hashCode = documentChange.hashCode();
DocumentChange exists =
Iterables.tryFind(
comparableDocumentChanges, docChange -> docChange.hashCode() == hashCode)
.orNull();
DocumentChange exists = null;
for (DocumentChange docChange : comparableDocumentChanges) {
if (docChange.hashCode() == hashCode) {
exists = docChange;
}
}

// Exists in docChanges with meta, but doesnt exist in docChanges without meta
if (exists == null) {
Expand Down
2 changes: 1 addition & 1 deletion packages/functions/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/in-app-messaging/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/installations/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/messaging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"expo": ">=47.0.0"
},
"devDependencies": {
"expo": "^50.0.15"
"expo": "^50.0.18"
},
"peerDependenciesMeta": {
"expo": {
Expand Down
2 changes: 1 addition & 1 deletion packages/ml/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/perf/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/perf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"expo": ">=47.0.0"
},
"devDependencies": {
"expo": "^50.0.15"
"expo": "^50.0.18"
},
"peerDependenciesMeta": {
"expo": {
Expand Down
2 changes: 1 addition & 1 deletion packages/remote-config/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/storage/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/_TEMPLATE_/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
}

dependencies {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.android.tools.build:gradle:8.4.0")
}
}
}
Expand Down
Loading
Loading