From b0faa31d299c4c116fa57ea512b1cd16d04851cb Mon Sep 17 00:00:00 2001 From: Egor Date: Thu, 7 Mar 2019 23:45:27 -0800 Subject: Updated Android build settings --- Common/NativeApp/Android/android_common.gradle | 2 +- Common/NativeApp/Android/build.gradle | 6 +----- DiligentCore | 2 +- DiligentSamples | 2 +- Tests/Android/TestApp/build.gradle | 3 +-- Tests/Android/build.gradle | 2 +- unityplugin/Android/GhostCubeScene/build.gradle | 3 +-- unityplugin/Android/build.gradle | 2 +- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Common/NativeApp/Android/android_common.gradle b/Common/NativeApp/Android/android_common.gradle index dab09c6..e33180f 100644 --- a/Common/NativeApp/Android/android_common.gradle +++ b/Common/NativeApp/Android/android_common.gradle @@ -1,5 +1,5 @@ android { - compileSdkVersion=27 + compileSdkVersion=28 defaultConfig { minSdkVersion 21 diff --git a/Common/NativeApp/Android/build.gradle b/Common/NativeApp/Android/build.gradle index 529a8a3..355f285 100644 --- a/Common/NativeApp/Android/build.gradle +++ b/Common/NativeApp/Android/build.gradle @@ -39,9 +39,5 @@ buildDir './build' dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'com.android.support:appcompat-v7:25.1.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + implementation 'com.android.support:appcompat-v7:28.0.0' } diff --git a/DiligentCore b/DiligentCore index f95f627..4e82029 160000 --- a/DiligentCore +++ b/DiligentCore @@ -1 +1 @@ -Subproject commit f95f6273f8fcaf59d50b65ea12c2d0a4022ca4db +Subproject commit 4e8202984f134b207a9da42b953acd10b5b8d3bd diff --git a/DiligentSamples b/DiligentSamples index e6dbadb..7d07171 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit e6dbadb22893b53ff49eb744bb8ea189e6c611aa +Subproject commit 7d07171b1db00e902d8b2c3f0cabe342ef91fa71 diff --git a/Tests/Android/TestApp/build.gradle b/Tests/Android/TestApp/build.gradle index 3217c6c..70e486a 100644 --- a/Tests/Android/TestApp/build.gradle +++ b/Tests/Android/TestApp/build.gradle @@ -24,6 +24,5 @@ buildDir '../build/TestApp' dependencies { implementation project(":Common") implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:25.4.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.1' + implementation 'com.android.support:appcompat-v7:28.0.0' } diff --git a/Tests/Android/build.gradle b/Tests/Android/build.gradle index 4d9d4ff..5ed3ba1 100644 --- a/Tests/Android/build.gradle +++ b/Tests/Android/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.3.2' } } diff --git a/unityplugin/Android/GhostCubeScene/build.gradle b/unityplugin/Android/GhostCubeScene/build.gradle index d468171..791306c 100644 --- a/unityplugin/Android/GhostCubeScene/build.gradle +++ b/unityplugin/Android/GhostCubeScene/build.gradle @@ -24,6 +24,5 @@ buildDir '../build/GhostCubeScene' dependencies { implementation project(":Common") implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:25.4.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.1' + implementation 'com.android.support:appcompat-v7:28.0.0' } diff --git a/unityplugin/Android/build.gradle b/unityplugin/Android/build.gradle index baa81c2..18e5480 100644 --- a/unityplugin/Android/build.gradle +++ b/unityplugin/Android/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.3.2' } } -- cgit v1.2.3