From 413929de5697c428f8f6a3bf4f3a4ac64527dcb1 Mon Sep 17 00:00:00 2001 From: "R. Tyler Croy" Date: Wed, 2 Sep 2015 04:48:58 -0700 Subject: [PATCH] Upgrade a bunch of dependencies; moving to the latest stable of Ratpack (0.9.19) --- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- offtopic.gradle | 30 ++++++++++++++---------- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 760775d..fd7f6e5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,6 @@ org.gradle.daemon=true bintrayUser= bintrayKey= + +targetCompatibility=1.8 +sourceCompatibility=1.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index edc501d..38188af 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip diff --git a/offtopic.gradle b/offtopic.gradle index 1caa3d8..66fc84b 100644 --- a/offtopic.gradle +++ b/offtopic.gradle @@ -1,36 +1,40 @@ //////////////////////////////////////////////////////////////////////////////// // PLUGIN CONFIGURATION //////////////////////////////////////////////////////////////////////////////// -plugins { - id "io.ratpack.ratpack-groovy" version "0.9.10" - id 'com.jfrog.bintray' version '1.0' +buildscript { + repositories { + jcenter() + } + + dependencies { + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:[1.3.1,1.4)' + classpath 'io.ratpack:ratpack-gradle:[0.9.19,1.0)' + } } apply plugin: 'groovy' +apply plugin: 'com.jfrog.bintray' +apply plugin: 'io.ratpack.ratpack-groovy' //////////////////////////////////////////////////////////////////////////////// version = '0.2.0' group = 'offtopic' description =' Offtopic is a simple web application built with Ratpack for inspecting and consuming events from Kafka.' -sourceCompatibility = '1.8' -targetCompatibility = '1.8' //////////////////////////////////////////////////////////////////////////////// // DEPENDENCY AND REPOSITORY MANAGEMENT //////////////////////////////////////////////////////////////////////////////// repositories { - mavenLocal() - jcenter() - mavenCentral() } dependencies { - compile 'io.ratpack:ratpack-handlebars:0.9.10+' - compile 'io.ratpack:ratpack-jackson:0.9.10+' - compile 'io.ratpack:ratpack-codahale-metrics:0.9.10+' - compile localGroovy() + compile 'org.codehaus.groovy:groovy-all:2.4.4' + + compile 'io.ratpack:ratpack-handlebars:[0.9.19,1.0)' + compile 'io.ratpack:ratpack-jackson:[0.9.17,1.0)' + compile 'io.ratpack:ratpack-codahale-metrics:[0.9.19,1.0)' /* Needed for discovering brokers and all kinds of other things in * Zookeeeper @@ -43,7 +47,7 @@ dependencies { // and matching dependencies compile 'org.apache.zookeeper:zookeeper:3.5.+' - testCompile 'org.spockframework:spock-core:0.7-groovy-2.0' + testCompile 'org.spockframework:spock-core:1.0-groovy-2.4' testCompile 'cglib:cglib-nodep:2.2.+' } ////////////////////////////////////////////////////////////////////////////////