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/src | |
| 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/src')
| -rw-r--r-- | android/src/Glacier2/build.gradle | 3 | ||||
| -rw-r--r-- | android/src/Ice/build.gradle | 3 | ||||
| -rw-r--r-- | android/src/IceBox/build.gradle | 3 | ||||
| -rw-r--r-- | android/src/IceGrid/build.gradle | 3 | ||||
| -rw-r--r-- | android/src/IcePatch2/build.gradle | 3 | ||||
| -rw-r--r-- | android/src/IceStorm/build.gradle | 3 |
6 files changed, 18 insertions, 0 deletions
diff --git a/android/src/Glacier2/build.gradle b/android/src/Glacier2/build.gradle index 4ee46215f89..b6e29f91108 100644 --- a/android/src/Glacier2/build.gradle +++ b/android/src/Glacier2/build.gradle @@ -11,6 +11,9 @@ apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" apply from: "$rootProject.projectDir/../java/src/Glacier2/build.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { diff --git a/android/src/Ice/build.gradle b/android/src/Ice/build.gradle index 98357fc0575..1c10e6b2a35 100644 --- a/android/src/Ice/build.gradle +++ b/android/src/Ice/build.gradle @@ -11,6 +11,9 @@ apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" apply from: "$rootProject.projectDir/../java/src/Ice/build.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { diff --git a/android/src/IceBox/build.gradle b/android/src/IceBox/build.gradle index 049f4af7cd3..a2504d23fb3 100644 --- a/android/src/IceBox/build.gradle +++ b/android/src/IceBox/build.gradle @@ -11,6 +11,9 @@ apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" apply from: "$rootProject.projectDir/../java/src/IceBox/build.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { diff --git a/android/src/IceGrid/build.gradle b/android/src/IceGrid/build.gradle index f11a114083c..97b03855641 100644 --- a/android/src/IceGrid/build.gradle +++ b/android/src/IceGrid/build.gradle @@ -11,6 +11,9 @@ apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" apply from: "$rootProject.projectDir/../java/src/IceGrid/build.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { diff --git a/android/src/IcePatch2/build.gradle b/android/src/IcePatch2/build.gradle index 70c4fe98f82..a80d2176a4f 100644 --- a/android/src/IcePatch2/build.gradle +++ b/android/src/IcePatch2/build.gradle @@ -11,6 +11,9 @@ apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" apply from: "$rootProject.projectDir/../java/src/IcePatch2/build.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { diff --git a/android/src/IceStorm/build.gradle b/android/src/IceStorm/build.gradle index 2a59f4c67d0..4b44402daf4 100644 --- a/android/src/IceStorm/build.gradle +++ b/android/src/IceStorm/build.gradle @@ -11,6 +11,9 @@ apply plugin: 'java' apply from: "$rootProject.projectDir/../java/gradle/ice.gradle" apply from: "$rootProject.projectDir/../java/src/IceStorm/build.gradle" +sourceCompatibility = iceSourceCompatibility +targetCompatibility = iceTargetCompatibility + sourceSets { main { java { |