Skip to content

Commit

Permalink
fix(deps): AGP7.0.4, firebase-android-sdk 29.0.2, javascript deps
Browse files Browse the repository at this point in the history
also includes fix for eslint to focus it on packages (otherwise it
hung locally for me) and fix a possible empty test name
  • Loading branch information
mikehardy committed Dec 13, 2021
1 parent b9af132 commit 55d0a36
Show file tree
Hide file tree
Showing 28 changed files with 584 additions and 587 deletions.
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build:all:clean": "lerna run build:clean",
"build:all:build": "lerna run build",
"lint": "yarn lint:js && yarn lint:android && yarn lint:ios:check",
"lint:js": "eslint . --ext .js,.jsx,.ts,.tsx --max-warnings=0",
"lint:js": "eslint packages/** --ext .js,.jsx,.ts,.tsx --max-warnings=0",
"lint:android": "google-java-format --set-exit-if-changed --replace --glob=\"packages/**/android/**/*.java\"",
"lint:ios:check": "clang-format --glob=\"packages/**/ios/**/*.{h,cpp,m,mm}\" --style=Google -n -Werror",
"lint:ios:fix": "clang-format -i --glob=\"packages/**/ios/**/*.{h,cpp,m,mm}\" --style=Google",
Expand Down Expand Up @@ -53,29 +53,29 @@
"@tsconfig/node12": "^1.0.9",
"@types/jest": "^27.0.3",
"@types/react": "^17.0.37",
"@types/react-native": "^0.66.6",
"@typescript-eslint/eslint-plugin": "^5.5.0",
"@typescript-eslint/parser": "^5.5.0",
"babel-jest": "^27.4.1",
"@types/react-native": "^0.66.9",
"@typescript-eslint/eslint-plugin": "^5.6.0",
"@typescript-eslint/parser": "^5.6.0",
"babel-jest": "^27.4.4",
"clang-format": "^1.6.0",
"codecov": "^3.8.3",
"conventional-changelog-cli": "^2.0.34",
"cross-env": "^7.0.3",
"eslint": "^8.3.0",
"eslint": "^8.4.1",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-mocha": "^9.0.0",
"eslint-plugin-mocha": "^10.0.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.27.1",
"genversion": "^3.0.2",
"google-java-format": "^1.0.1",
"inquirer": "^8.2.0",
"jest": "^27.4.3",
"jest": "^27.4.4",
"lerna": "4.0.0",
"prettier": "^2.5.0",
"prettier": "^2.5.1",
"rimraf": "^3.0.2",
"shelljs": "^0.8.3",
"ts-jest": "^27.0.7",
"typescript": "^4.5.2"
"ts-jest": "^27.1.1",
"typescript": "^4.5.3"
},
"resolutions": {
"@types/react": "^17.0.37"
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3')
classpath('com.android.tools.build:gradle:7.0.4')
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"react-native": "*"
},
"dependencies": {
"@expo/config-plugins": "^4.0.10",
"@expo/config-plugins": "^4.0.12",
"opencollective-postinstall": "^2.0.1",
"superstruct": "^0.6.2"
},
Expand All @@ -72,11 +72,11 @@
"targetSdk": 31,
"compileSdk": 31,
"buildTools": "30.0.3",
"firebase": "29.0.1",
"firebase": "29.0.2",
"firebaseCrashlyticsGradle": "2.8.1",
"firebasePerfGradle": "1.4.0",
"gmsGoogleServicesGradle": "4.3.10",
"playServicesAuth": "19.2.0"
"playServicesAuth": "20.0.0"
}
}
}
2 changes: 1 addition & 1 deletion 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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/crashlytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@react-native-firebase/app": "13.1.0"
},
"dependencies": {
"@expo/config-plugins": "^4.0.10",
"@expo/config-plugins": "^4.0.12",
"stacktrace-js": "^2.0.0"
},
"publishConfig": {
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/firestore/e2e/issues.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
const COLLECTION = 'firestore';

describe('firestore()', function () {
describe(COLLECTION, function () {
describe('issues', function () {
before(async function () {
await Promise.all([
firebase.firestore().doc(`${COLLECTION}/wbXwyLJheRfYXXWlY46j`).set({ index: 2, number: 2 }),
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/perf/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@react-native-firebase/app": "13.1.0"
},
"dependencies": {
"@expo/config-plugins": "^4.0.10"
"@expo/config-plugins": "^4.0.12"
},
"publishConfig": {
"access": "public"
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.3")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
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:7.0.0")
classpath("com.android.tools.build:gradle:7.0.4")
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ buildscript {
ext.ndkVersion = '21.4.7075529'

ext.kotlinVersion = '1.6.0' // https://kotlinlang.org/releases.html
ext.supportLibVersion = '1.6.0' // this maps to androidx.core https://developer.android.com/jetpack/androidx/releases/core
ext.supportLibVersion = '1.7.0' // this maps to androidx.core https://developer.android.com/jetpack/androidx/releases/core
//noinspection GradleDependency https://github.com/facebook/react-native/pull/30061
// Can bump to 1.4.0 when react-native 0.68 ships https://github.com/facebook/react-native/commit/e21f8ec34984551f87a306672160cc88e67e4793
ext.appCompatVersion = '1.3.1' // this maps to androidx.appcompat https://developer.android.com/jetpack/androidx/releases/appcompat
ext.appCompatVersion = '1.4.0' // this maps to androidx.appcompat https://developer.android.com/jetpack/androidx/releases/appcompat
ext.supportVersion = ext.supportLibVersion
ext.frescoVersion = '2.6.0' // https://github.com/facebook/fresco/releases
ext.fragmentVersion = '1.4.0' // https://developer.android.com/jetpack/androidx/releases/fragment
ext.vectordrawableVersion = '1.1.0' // https://developer.android.com/jetpack/androidx/releases/vectordrawable
ext.androidxAnnotationVersion = '1.3.0' // https://developer.android.com/jetpack/androidx/releases/annotation
ext.googlePlayServicesLocationVersion = '18.0.0' // https://developers.google.com/android/guides/setup
ext.googlePlayServicesVersion = '17.6.0' // play-services-base
ext.googlePlayServicesAuthVersion = '19.2.0' // play-services-auth
ext.googlePlayServicesVersion = '18.0.0' // play-services-base
ext.googlePlayServicesAuthVersion = '20.0.0' // play-services-auth
ext.googlePlayServicesVisionVersion = '20.1.3' // play-services-vision
ext.mediaCompatVersion = '1.4.3' // https://developer.android.com/jetpack/androidx/releases/media
ext.supportV4Version = '1.0.0' // https://developer.android.com/jetpack/androidx/releases/legacy androidx.legacy:legacy-support-v4
Expand All @@ -32,7 +32,7 @@ buildscript {
}
dependencies {
classpath 'com.google.gms:google-services:4.3.10' // https://developers.google.com/android/guides/google-services-plugin
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.0.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.google.firebase:perf-plugin:1.4.0'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
Expand Down
Loading

0 comments on commit 55d0a36

Please sign in to comment.