Skip to content

Commit 5d3a9e8

Browse files
committed
Merge branch 'master' into ss-functions-emulator-settings
2 parents 85c3514 + 874cca0 commit 5d3a9e8

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

apk-size/apk-size.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ buildscript {
2020

2121
}
2222
dependencies {
23-
classpath 'com.android.tools.build:gradle:3.6.2'
23+
classpath 'com.android.tools.build:gradle:3.4.2'
2424
}
2525
}
2626

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ buildscript {
2929
}
3030

3131
dependencies {
32-
classpath 'com.android.tools.build:gradle:3.6.2'
32+
classpath 'com.android.tools.build:gradle:3.4.2'
3333
classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
3434
classpath 'net.ltgt.gradle:gradle-errorprone-plugin:0.7.1'
3535
classpath 'org.jsoup:jsoup:1.11.2'

buildSrc/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies {
4747
runtime 'io.opencensus:opencensus-impl:0.18.0'
4848
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
4949
implementation 'org.jetbrains.dokka:dokka-android-gradle-plugin:0.9.17-g008'
50-
implementation 'com.android.tools.build:gradle:3.6.2'
50+
implementation 'com.android.tools.build:gradle:3.4.2'
5151

5252
testImplementation 'junit:junit:4.13-rc-1'
5353
testImplementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'

firebase-crashlytics-ndk/README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ In addition, **this project requires NDK version r17c to build.**
1313

1414
### Setting up NDK r17c
1515

16-
1. Download the appropriate zip for your build environment
17-
[here](https://developer.android.com/ndk/downloads/older_releases.html).
18-
2. Unzip the package into an accessible directory.
19-
3. In your `local.properties` file in the root of this project, add
20-
`ndk.dir=/path/to/android-ndk-r17c` with the path to the unzipped package.
16+
1. Follow the instructions
17+
[here](https://developer.android.com/studio/projects/install-ndk#specific-version)
18+
to install NDK version 17.2.4988734.
2119

2220
## Building
2321

0 commit comments

Comments
 (0)