diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle index 60800e19..dc94a5d1 100644 --- a/packages/analytics/android/build.gradle +++ b/packages/analytics/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle index 79a43e1b..5eeb914a 100644 --- a/packages/app/android/build.gradle +++ b/packages/app/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/config/android/build.gradle b/packages/config/android/build.gradle index f948fae7..da4e6dd0 100644 --- a/packages/config/android/build.gradle +++ b/packages/config/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/crashlytics/android/build.gradle b/packages/crashlytics/android/build.gradle index 8d4d4d5c..d8d5101a 100644 --- a/packages/crashlytics/android/build.gradle +++ b/packages/crashlytics/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/functions/android/build.gradle b/packages/functions/android/build.gradle index fa897caf..4bf077c4 100644 --- a/packages/functions/android/build.gradle +++ b/packages/functions/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/iid/android/build.gradle b/packages/iid/android/build.gradle index 7457f23e..75e66133 100644 --- a/packages/iid/android/build.gradle +++ b/packages/iid/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/mlkit/android/build.gradle b/packages/mlkit/android/build.gradle index 0988397a..797cf48c 100644 --- a/packages/mlkit/android/build.gradle +++ b/packages/mlkit/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle index 6c48bf64..f68ff643 100644 --- a/packages/perf/android/build.gradle +++ b/packages/perf/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/packages/utils/android/build.gradle b/packages/utils/android/build.gradle index 33d802fb..b9203ff6 100644 --- a/packages/utils/android/build.gradle +++ b/packages/utils/android/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' } } diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 86670163..5773b762 100755 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -1,5 +1,5 @@ apply plugin: "com.android.application" -//apply plugin: "com.google.firebase.firebase-perf" +apply plugin: "com.google.firebase.firebase-perf" apply plugin: 'io.fabric' import com.android.build.OutputFile @@ -84,6 +84,7 @@ android { } packagingOptions { + exclude 'META-INF/proguard/androidx-annotations.pro' exclude 'META-INF/-no-jdk.kotlin_module' exclude 'META-INF/DEPENDENCIES' exclude 'META-INF/NOTICE' diff --git a/tests/android/build.gradle b/tests/android/build.gradle index 97230dbd..52f37fac 100755 --- a/tests/android/build.gradle +++ b/tests/android/build.gradle @@ -1,18 +1,18 @@ buildscript { - ext.kotlinVersion = '1.3.11' + ext.kotlinVersion = '1.3.20' repositories { - jcenter() google() + jcenter() mavenCentral() maven { url 'https://maven.fabric.io/public' } } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.1' classpath 'com.google.gms:google-services:4.2.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" -// classpath 'com.google.firebase:firebase-plugins:1.1.5' + classpath 'com.google.firebase:firebase-plugins:1.1.5' classpath 'io.fabric.tools:gradle:1.26.1' } } @@ -34,8 +34,8 @@ allprojects { println "${project.name} ${projectDir} ${rootDir}" repositories { - jcenter() google() + jcenter() mavenLocal() maven { url "$rootDir/../node_modules/react-native/android"