Permalink
Browse files

Bring up to date

  • Loading branch information...
pixoto committed Jul 29, 2016
1 parent 29b9240 commit 2c740161fbd73b28c758aa449e0f310e2b2457c0
View
@@ -12,4 +12,5 @@ out
website/war/api
website/war/WEB-INF/classes
website/war/WEB-INF/lib
gaelyk-docgenerator
/gaelyk-template-project.zip
View
@@ -9,7 +9,7 @@ allprojects {
}
version = '2.2.1.SNAPSHOT'
version = '2.2.1-SNAPSHOT'
group = 'org.gaelyk'
}
@@ -40,5 +40,5 @@ task templateProjectZip(type: Zip) {
}
task wrapper(type: Wrapper) {
gradleVersion = '2.13'
gradleVersion = '2.14.1'
}
View
@@ -1,9 +1,9 @@
project.ext.gaelykGroovyVersion = '2.4.6'
project.ext.gaelykGroovyVersion = '2.4.7'
project.ext.gaelykSpockVersion = '1.0-groovy-2.4'
project.ext.gaelykAppEngineVersion = '1.9.37'
project.ext.gaelykAppEngineVersion = '1.9.40'
project.ext.gaelykLatestVersion = '2.2.0'
project.ext.gaelykSpockLatestVersion = '0.4'
project.ext.gaelykGradleVersion = '2.13'
project.ext.gaelykGradleVersion = '2.14.1'
repositories {
mavenCentral()
Binary file not shown.
@@ -1,6 +1,6 @@
#Tue Apr 26 18:13:20 COT 2016
#Thu Jul 28 15:57:46 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
Binary file not shown.
@@ -1,6 +1,6 @@
#Tue Apr 26 18:13:19 COT 2016
#Thu Jul 28 15:57:46 PDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
@@ -6,8 +6,11 @@ out
*.iws
.idea
.gradle
gradle
gradlew
gradlew.bat
.classpath
.project
.settings
src/main/webapp/WEB-INF/lib
src/main/webapp/WEB-INF/classes
src/main/webapp/WEB-INF/classes
@@ -14,7 +14,7 @@ buildscript {
}
dependencies {
classpath 'com.google.appengine:gradle-appengine-plugin:1.9.34'
classpath 'com.google.appengine:gradle-appengine-plugin:1.9.38'
//classpath 'org.gradle.api.plugins:gradle-gaelyk-plugin:0.7.0'
classpath 'org.gradle.api.plugins:gradle-appengine-geb-plugin:0.4'
}
@@ -26,8 +26,8 @@ repositories {
}
dependencies {
def gaeVersion = '1.9.38'
def groovyVersion = '2.4.6'
def gaeVersion = '1.9.40'
def groovyVersion = '2.4.7'
compile "org.codehaus.groovy:groovy-all:${groovyVersion}"
@@ -37,7 +37,7 @@ dependencies {
compile 'org.sitemesh:sitemesh:3.0.1'
compile 'org.gaelyk:gaelyk:2.2.0'
// compile project.files('../core/build/libs/gaelyk-2.2.1.SNAPSHOT.jar')
//compile project.files('../core/build/libs/gaelyk-2.2.1-SNAPSHOT.jar')
testCompile 'org.gaelyk:gaelyk-spock:0.4'
testCompile "com.google.appengine:appengine-api-stubs:$gaeVersion",
@@ -62,13 +62,16 @@ dependencies {
* @see https://github.com/gaelyk/gaelyk-console-plugin
*/
compile 'org.gaelyk:gaelyk-console:2.2.0', {
// exclude module: "gaelyk"
exclude module: "gaelyk"
exclude module: "appengine-testing"
exclude module: "appengine-api-stubs"
}
}
}
appengine {
downloadSdk = true
}
task wrapper(type: Wrapper) {
gradleVersion = '2.14.1'
}

0 comments on commit 2c74016

Please sign in to comment.