Merge e61130a into dcfd356

facebook · Sep 9, 2021 · dfa0ff4 · dfa0ff4
2 parents dcfd356 + e61130a
commit dfa0ff4
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2.1
 executors:
   default-executor:
     docker:
-      - image: circleci/android:api-29-ndk
+      - image: circleci/android:api-30-ndk
     resource_class: large
 
     environment:

diff --git a/.github/workflows/android-sample.yml b/.github/workflows/android-sample.yml
@@ -13,8 +13,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Install NDK 21
-      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
     - name: Compute build cache
       run: ./scripts/checksum-android.sh checksum-android.txt
     - uses: actions/cache@v2

diff --git a/.github/workflows/publish-android.yml b/.github/workflows/publish-android.yml
@@ -22,8 +22,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Install NDK 20, 21
-      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
     - name: Write GPG Sec Ring
       run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
     - name: Update gradle.properties

diff --git a/.github/workflows/react-native-example.yml b/.github/workflows/react-native-example.yml
@@ -42,8 +42,6 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 1.8
-    - name: Install NDK 21
-      run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
     - name: Compute build cache
       run: ${GITHUB_WORKSPACE}/scripts/checksum-android.sh checksum-android.txt
     - uses: actions/cache@v2

diff --git a/android/third-party/native.gradle b/android/third-party/native.gradle
@@ -11,7 +11,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 // Increment this when making changes to any of the native
 // dependencies.
 // !!!
-final def CACHE_REVISION = 30
+final def CACHE_REVISION = 31
 
 final def externalDir = new File("$projectDir/external")
 final def downloadsDir = new File("$externalDir/downloads")
@@ -195,15 +195,15 @@ task finalizeLibEvent(dependsOn: [prepareLibEvent2], type: Copy) {
 
 task downloadOpenSSLSource(dependsOn: [], type: Download) {
     onlyIf { isCacheOutOfDate(CACHE_REVISION) }
-    src 'https://github.com/passy/openssl-android/releases/download/1.1.0h/openssl-1.1.0h.tar.gz'
+    src 'https://github.com/passy/openssl-android/releases/download/1.1.1k/openssl-1.1.1k.tar.gz'
     onlyIfNewer true
     overwrite false
     dest new File(downloadsDir, getDownloadFileName(src))
 }
 
 task downloadOpenSSLLibs(dependsOn: [], type: Download) {
     onlyIf { isCacheOutOfDate(CACHE_REVISION) }
-    src 'https://github.com/passy/openssl-android/releases/download/1.1.0h-r2/openssl-1.1.0h-r2-prebuilt.tar.gz'
+    src 'https://github.com/passy/openssl-android/releases/download/1.1.1k/openssl-1.1.1k-prebuilt.tar.gz'
     onlyIfNewer true
     overwrite false
     dest new File(downloadsDir, getDownloadFileName(src))
@@ -214,25 +214,25 @@ task prepareOpenSSL(dependsOn: [downloadOpenSSLSource, downloadOpenSSLLibs], typ
     from tarTree(downloadOpenSSLSource.dest)
     from tarTree(downloadOpenSSLLibs.dest)
     from './overrides/OpenSSL/'
-    include 'openssl-1.1.0h/**/*'
+    include 'openssl-1.1.1k/**/*'
     include 'libs/**/*'
     includeEmptyDirs = false
     into "$externalDir/OpenSSL/"
 }
 
 task configureOpenSSL(dependsOn: [prepareOpenSSL], type: Exec) {
     onlyIf { isCacheOutOfDate(CACHE_REVISION) }
-    workingDir "$externalDir/OpenSSL/openssl-1.1.0h/"
+    workingDir "$externalDir/OpenSSL/openssl-1.1.1k/"
     // This is only to generate a buildconfig.h in the next step. I **believe**
     // that the options here don't really matter for that file.
-    commandLine './Configure', 'dist'
+    commandLine './Configure', 'linux-generic64'
 }
 
 task finalizeOpenSSL(dependsOn: [configureOpenSSL], type: Exec) {
     onlyIf { isCacheOutOfDate(CACHE_REVISION) }
-    workingDir "$externalDir/OpenSSL/openssl-1.1.0h/"
+    workingDir "$externalDir/OpenSSL/openssl-1.1.1k/"
     commandLine 'make', 'build_generated'
-    onlyIf { !file("$externalDir/OpenSSL/openssl-1.1.0h/include/openssl/opensslconf.h").exists() }
+    onlyIf { !file("$externalDir/OpenSSL/openssl-1.1.1k/include/openssl/opensslconf.h").exists() }
 }
 
 task downloadRSocket(dependsOn: [], type: Download) {

diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.vanniktech:gradle-maven-publish-plugin:0.17.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.5.0"
@@ -49,7 +49,7 @@ ext {
     targetSdkVersion = 30
     compileSdkVersion = 30
     buildToolsVersion = '30.0.2'
-    ndkVersion = '21.3.6528147'
+    ndkVersion = '23.0.7599858'
 }
 
 ext.deps = [