diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-06-17 10:23:31 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-06-17 10:23:31 -0230 |
| commit | 829f89a5e76d2e1fa56d6e3cfab76a4846066f63 (patch) | |
| tree | 1b4852f7e3002c520aaae257638de543f09b7988 /android/test | |
| parent | Update build instructions for JavaScript and WinRT (diff) | |
| download | ice-829f89a5e76d2e1fa56d6e3cfab76a4846066f63.tar.bz2 ice-829f89a5e76d2e1fa56d6e3cfab76a4846066f63.tar.xz ice-829f89a5e76d2e1fa56d6e3cfab76a4846066f63.zip | |
ICE-6605 Fixed android tests to work with Java 1.8
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/build.gradle | 6 | ||||
| -rw-r--r-- | android/test/plugins/build.gradle | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/android/test/build.gradle b/android/test/build.gradle index 9c15a815763..b5ecd4c6703 100644 --- a/android/test/build.gradle +++ b/android/test/build.gradle @@ -15,6 +15,9 @@ apply from: "$rootProject.projectDir/../java/test/slice.gradle" apply from: "$rootProject.projectDir/gradle/tests.gradle" apply from: "$rootProject.projectDir/gradle/dex.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { @@ -42,6 +45,9 @@ tests.each { apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" + sourceCompatibility = iceSourceCompatibility + targetCompatibility = iceTargetCompatibility + sourceSets { main { java { diff --git a/android/test/plugins/build.gradle b/android/test/plugins/build.gradle index cb60687a6fe..dd5c4705412 100644 --- a/android/test/plugins/build.gradle +++ b/android/test/plugins/build.gradle @@ -11,6 +11,9 @@ apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" apply from: "$rootProject.projectDir/gradle/dex.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { |