From a6b56338d26fe5c839ce88797067a3cb66f24018 Mon Sep 17 00:00:00 2001 From: Niklas Baudy Date: Tue, 24 Nov 2015 08:48:26 +0100 Subject: [PATCH] Add Java 1.7 source compatibility. Fixes #7 --- .travis.yml | 18 ++++++++++++------ build.gradle | 7 +++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8c3135b..83324c6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,24 @@ language: groovy -env: - global: - - secure: "MzOFFRAE6bEO5NzGQBFQ1am0lHwbsWqRdP/OTL/Ka/QgjryIETiLZdNUua23DwcJMuiMKVR0I03lqW5PCF0yT1+R8KECncF1P61YrHtATr0KhfXJ/z3DcqtxsBJ4gtVEJfuBXCgdHyYbMmS6UJVMgejCqv4YKYQggtOe/wgNm0PjwPOEQ7aktz47yEUbQOr9jxNwYDLNGzbgc9oBt+rFFYY+EfcbLQrrfq6sMyioc9c8UqNESRcAgapptwnywofd1fbgSvZ1kYpwD9scPcFgZFiG7KzNyxU0/GL2ojAT3buZFYKEToAFLTKFdHJTzwMMlUOMFoW4FB/aMlObvCcaguuMhkoD8ApaJg9Y3YLTkUzBDc6AvIvg4MwoujP6NawJJZEinG1EtuKc577WtXIpaA700s+m/go/Bsel27TUIFWnPQiPUyuyUoHvd/1xI2d1EWKZjudeaHTIhv5N8Y1W3Lb2AriSZ2ijK22I4QnrikDv1iWTaPYr8EGJbOOp4ifldLEpBJZSk8Eqv40ow5nSPNc8wmQ5Zd38wgp/qY0ZBgVOtKAUzi4t6K2hyTr7gIZ1fKyhYrIZuQFluLnQAzHQcNZM/Hlf5c9DS6tdJhSYBFbqzSlZ7UL3E98+3MZ9Bc15Z8HTlGrw1NTbLrAgpmE12PJN+oBR5U+Hay5VOJIpu+w=" - - secure: "rhhkm3u4m9kZuDJQAtGIEW8kvwIb25bDnBJgmMR7HwCZhju1TT9nfe7kK630dj4fdVfyb9yBxHsdVRxyz8OeqxHMh0GfanJNs0rAH9aqIwXfGc8Qv7kFq9fjKojRIObvRR/0N/gJ2WXwmat7iM8AtUvNtj/hTXEcl1dd3Th9inLbuG57eS/5jT4n9czJ8Wg9nZfHXePlCFTJDEnyvmatAHvkR3CsvzUVclXGQAvw2MGA6QqXOnPDGYKX2z5scePsU0awOg0q2+H2zs2wHsyZnIf2Jn/gngWF8ij2GcVSxreX7hDBAaBhcm6KXejr81WT9sQaMCQUfFZhEo2+P86f0p2JkW1gub9h7VUQhMU1LZSHhFEWBfuNAYN2iboRJOxp7lBcTQEup+3L3mFhdwQe4f5rHyTK1t7doj+4+SLQoOmyaoTLIdZzafeQzv6JYMuJRbtDsTWSzPMzMtjzBBBC2qzVNuHiXxypNTjeOAJKDNwn5YhubTro5z5KeuM1D8/gb1TKFXOpOBUu1SJPu5CeuaP6U9D/0rny6QL2bC114qJNLTnWqEHk58lIVC/sVrWd3uxWFph6rUUEM0wgC9Uz2y2iye8OauamgfN5RP7e2ETR0NnI9USik/KuKD1MhVMh8A3q2GyaMMTEFg20dhJP40hRntb0sUxv0DW/sqIWp9I=" - -script: ./gradlew clean build +groovy: + - 2.3.6 + - 2.3.9 jdk: - oraclejdk8 +install: true + +script: ./gradlew clean build + after_success: - .buildscript/deploy_snapshot.sh +env: + global: + - secure: "MzOFFRAE6bEO5NzGQBFQ1am0lHwbsWqRdP/OTL/Ka/QgjryIETiLZdNUua23DwcJMuiMKVR0I03lqW5PCF0yT1+R8KECncF1P61YrHtATr0KhfXJ/z3DcqtxsBJ4gtVEJfuBXCgdHyYbMmS6UJVMgejCqv4YKYQggtOe/wgNm0PjwPOEQ7aktz47yEUbQOr9jxNwYDLNGzbgc9oBt+rFFYY+EfcbLQrrfq6sMyioc9c8UqNESRcAgapptwnywofd1fbgSvZ1kYpwD9scPcFgZFiG7KzNyxU0/GL2ojAT3buZFYKEToAFLTKFdHJTzwMMlUOMFoW4FB/aMlObvCcaguuMhkoD8ApaJg9Y3YLTkUzBDc6AvIvg4MwoujP6NawJJZEinG1EtuKc577WtXIpaA700s+m/go/Bsel27TUIFWnPQiPUyuyUoHvd/1xI2d1EWKZjudeaHTIhv5N8Y1W3Lb2AriSZ2ijK22I4QnrikDv1iWTaPYr8EGJbOOp4ifldLEpBJZSk8Eqv40ow5nSPNc8wmQ5Zd38wgp/qY0ZBgVOtKAUzi4t6K2hyTr7gIZ1fKyhYrIZuQFluLnQAzHQcNZM/Hlf5c9DS6tdJhSYBFbqzSlZ7UL3E98+3MZ9Bc15Z8HTlGrw1NTbLrAgpmE12PJN+oBR5U+Hay5VOJIpu+w=" + - secure: "rhhkm3u4m9kZuDJQAtGIEW8kvwIb25bDnBJgmMR7HwCZhju1TT9nfe7kK630dj4fdVfyb9yBxHsdVRxyz8OeqxHMh0GfanJNs0rAH9aqIwXfGc8Qv7kFq9fjKojRIObvRR/0N/gJ2WXwmat7iM8AtUvNtj/hTXEcl1dd3Th9inLbuG57eS/5jT4n9czJ8Wg9nZfHXePlCFTJDEnyvmatAHvkR3CsvzUVclXGQAvw2MGA6QqXOnPDGYKX2z5scePsU0awOg0q2+H2zs2wHsyZnIf2Jn/gngWF8ij2GcVSxreX7hDBAaBhcm6KXejr81WT9sQaMCQUfFZhEo2+P86f0p2JkW1gub9h7VUQhMU1LZSHhFEWBfuNAYN2iboRJOxp7lBcTQEup+3L3mFhdwQe4f5rHyTK1t7doj+4+SLQoOmyaoTLIdZzafeQzv6JYMuJRbtDsTWSzPMzMtjzBBBC2qzVNuHiXxypNTjeOAJKDNwn5YhubTro5z5KeuM1D8/gb1TKFXOpOBUu1SJPu5CeuaP6U9D/0rny6QL2bC114qJNLTnWqEHk58lIVC/sVrWd3uxWFph6rUUEM0wgC9Uz2y2iye8OauamgfN5RP7e2ETR0NnI9USik/KuKD1MhVMh8A3q2GyaMMTEFg20dhJP40hRntb0sUxv0DW/sqIWp9I=" + branches: except: - gh-pages diff --git a/build.gradle b/build.gradle index ac6f69e..39eca09 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,7 @@ buildscript { } apply plugin: 'groovy' +apply plugin: 'java' apply plugin: 'com.github.ben-manes.versions' apply plugin: 'com.gradle.plugin-publish' @@ -24,9 +25,11 @@ repositories { dependencies { compile gradleApi() compile localGroovy() - compile 'com.android.tools.build:gradle:1.3.1' + compile 'com.android.tools.build:gradle:1.5.0' } +sourceCompatibility = JavaVersion.VERSION_1_7 + group = GROUP version = VERSION_NAME @@ -45,7 +48,7 @@ pluginBundle { } task wrapper(type: Wrapper) { - gradleVersion = '2.8' + gradleVersion = '2.9' distributionUrl = "https://services.gradle.org/distributions/gradle-${gradleVersion}-all.zip" }