Skip to content
Closed
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

cmake_minimum_required(VERSION 3.13.0)
cmake_minimum_required(VERSION 3.13.0...3.31.6)

# Set the VERSION variables based on the project command
if (POLICY CMP0048)
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:7.3.0'
classpath("de.undercouch:gradle-download-task:4.0.2")
}
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 3 additions & 2 deletions android/hermes-engine/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ android {
arguments "-DANDROID_LD=lld"
arguments "-DIMPORT_HERMESC=${rootProject.ext.hermesC}"
arguments "-DHERMES_SLOW_DEBUG=False"
arguments "-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=True"
arguments "-DHERMES_BUILD_SHARED_JSI=True"
targets "libhermes"
}
Expand All @@ -44,7 +45,7 @@ android {

externalNativeBuild {
cmake {
version "3.18.1"
version "3.31.5"
path "../../CMakeLists.txt"
buildStagingDirectory = "${rootProject.ext.hermes_ws}/staging/hermes"
buildStagingDirectory.mkdirs()
Expand All @@ -67,7 +68,7 @@ android {
externalNativeBuild {
cmake {
arguments "-DHERMES_ENABLE_DEBUGGER=False"
arguments "-DCMAKE_BUILD_TYPE=MinSizeRel"
arguments "-DCMAKE_BUILD_TYPE=Release"
// This overrides CMAKE_SHARED_LINKER_FLAGS, it does not
// append to it. This is fine for now since it is unused.
arguments "-DCMAKE_SHARED_LINKER_FLAGS=-Wl,--strip-all,--build-id=none"
Expand Down
Loading