diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-05 18:44:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-05 18:44:18 +0100 |
| commit | 60ea8aea98e76fd4514c65ca1ebd7f015283e991 (patch) | |
| tree | 87b0db49601f26c4facd2aa0bfe6655b7999f34c /platform/android/java/app | |
| parent | 42595085a5a22f3b5399844d06e89631c42e8981 (diff) | |
| parent | c090caa58be3d35f4624ec78ea75f1a837cd28bd (diff) | |
Merge pull request #36603 from m4gr3d/implement_vk_surface_view
Provide a Vulkan surface view base implementation
Diffstat (limited to 'platform/android/java/app')
| -rw-r--r-- | platform/android/java/app/build.gradle | 2 | ||||
| -rw-r--r-- | platform/android/java/app/config.gradle | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/platform/android/java/app/build.gradle b/platform/android/java/app/build.gradle index 990fb35c46..632cedf34d 100644 --- a/platform/android/java/app/build.gradle +++ b/platform/android/java/app/build.gradle @@ -15,6 +15,7 @@ buildscript { } dependencies { classpath libraries.androidGradlePlugin + classpath libraries.kotlinGradlePlugin //CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN //CHUNK_BUILDSCRIPT_DEPENDENCIES_END } @@ -34,6 +35,7 @@ allprojects { dependencies { implementation libraries.supportCoreUtils + implementation libraries.kotlinStdLib if (rootProject.findProject(":lib")) { implementation project(":lib") diff --git a/platform/android/java/app/config.gradle b/platform/android/java/app/config.gradle index 7a983a1cc8..4fdb88314f 100644 --- a/platform/android/java/app/config.gradle +++ b/platform/android/java/app/config.gradle @@ -4,13 +4,16 @@ ext.versions = [ minSdk : 18, targetSdk : 29, buildTools : '29.0.1', - supportCoreUtils : '28.0.0' + supportCoreUtils : '28.0.0', + kotlinVersion : '1.3.61' ] ext.libraries = [ androidGradlePlugin: "com.android.tools.build:gradle:$versions.androidGradlePlugin", - supportCoreUtils : "com.android.support:support-core-utils:$versions.supportCoreUtils" + supportCoreUtils : "com.android.support:support-core-utils:$versions.supportCoreUtils", + kotlinGradlePlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlinVersion", + kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlinVersion" ] ext.getExportPackageName = { -> |