diff --git a/BUILDING.md b/BUILDING.md index 3b83cfaeaa..b3c9ab28e9 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -17,9 +17,9 @@ section below. To build Filament for Android you must also install the following: -- Android Studio 4.0 or more recent +- Android Studio 4.0.1 or more recent - Android SDK -- Android NDK "side-by-side" 21 or higher +- Android NDK "side-by-side" 21.3 or higher ### Environment variables diff --git a/android/build.gradle b/android/build.gradle index 6d1ec8d039..360b6d3ada 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -48,21 +48,20 @@ buildscript { 'targetSdk': 29, 'compileSdk': 29, 'kotlin': '1.3.72', - 'buildTools': '29.0.3', - 'ndk': '21.0.6113669' + 'buildTools': '30.0.1', + 'ndk': '21.3.6528147' ] ext.deps = [ 'androidx': [ 'annotations': "androidx.annotation:annotation:1.1.0", - 'core': "androidx.core:core:1.1.0", + 'core': "androidx.core:core:1.3.0", ], 'kotlin': "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" ] dependencies { - // NOTE: Do not update to 4.0.0, there is a bug breaking our build, 4.0.1 will have a fix - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" } diff --git a/build/android/build.sh b/build/android/build.sh index 275a9ee519..c74f3f3caa 100755 --- a/build/android/build.sh +++ b/build/android/build.sh @@ -8,7 +8,7 @@ # # The default is release -NDK_VERSION="ndk;21.0.6113669" +NDK_VERSION="ndk;21.3.6528147" ANDROID_NDK_VERSION=21 # Exclude Vulkan from CI builds for Android. (It is enabled for other platforms.)