Permalink
Browse files

upgraded dependencies (Groovy, Gradle, AppEngine), new snaphost release

  • Loading branch information...
musketyr committed May 15, 2015
1 parent df55665 commit e228ce0c93bdc4f2a765372f0ee21941967e4bbb
View
@@ -9,7 +9,7 @@ allprojects {
}
version = '2.2'
version = '2.2-SNAPSHOT'
group = 'org.gaelyk'
}
@@ -40,5 +40,5 @@ task templateProjectZip(type: Zip) {
}
task wrapper(type: Wrapper) {
gradleVersion = '1.10'
gradleVersion = '2.4'
}
View
@@ -1,9 +1,9 @@
ext.gaelykGroovyVersion = '2.3.0'
ext.gaelykSpockVersion = '0.7-groovy-2.0'
ext.gaelykAppEngineVersion = '1.9.19'
ext.gaelykLatestVersion = '2.2'
ext.gaelykSpockLatestVersion = '0.4'
ext.gaelykGradleVersion = '1.10'
project.ext.gaelykGroovyVersion = '2.4.3'
project.ext.gaelykSpockVersion = '0.7-groovy-2.0'
project.ext.gaelykAppEngineVersion = '1.9.20'
project.ext.gaelykLatestVersion = '2.2'
project.ext.gaelykSpockLatestVersion = '0.4'
project.ext.gaelykGradleVersion = '2.4'
repositories {
mavenCentral()
View
@@ -48,20 +48,20 @@ configurations {
}
dependencies {
compile "org.codehaus.groovy:groovy-all:${ext.gaelykGroovyVersion}", {
compile "org.codehaus.groovy:groovy-all:${project.ext.gaelykGroovyVersion}", {
force = true
}
// compile "org.codehaus.groovy:groovy-servlet:${ext.gaelykGroovyVersion}"
// groovy "org.codehaus.groovy:groovy-ant:${ext.gaelykGroovyVersion}" // for groovy-doc only
compile "com.google.appengine:appengine-api-1.0-sdk:${ext.gaelykAppEngineVersion}"
compile "com.google.appengine:appengine-api-labs:${ext.gaelykAppEngineVersion}"
// compile "org.codehaus.groovy:groovy-servlet:${project.ext.gaelykGroovyVersion}"
// groovy "org.codehaus.groovy:groovy-ant:${project.ext.gaelykGroovyVersion}" // for groovy-doc only
compile "com.google.appengine:appengine-api-1.0-sdk:${project.ext.gaelykAppEngineVersion}"
compile "com.google.appengine:appengine-api-labs:${project.ext.gaelykAppEngineVersion}"
compile 'javax.servlet:servlet-api:2.5'
// groovy "org.codehaus.groovy:groovy-test:${ext.gaelykGroovyVersion}" // for tests only
// groovy "org.codehaus.groovy:groovy-test:${project.ext.gaelykGroovyVersion}" // for tests only
compile 'javax.servlet.jsp:jsp-api:2.2'
testCompile 'junit:junit:4.8.2'
testCompile "com.google.appengine:appengine-testing:${ext.gaelykAppEngineVersion}"
testCompile "com.google.appengine:appengine-api-stubs:${ext.gaelykAppEngineVersion}"
testCompile "org.spockframework:spock-core:${ext.gaelykSpockVersion}", {
testCompile "com.google.appengine:appengine-testing:${project.ext.gaelykAppEngineVersion}"
testCompile "com.google.appengine:appengine-api-stubs:${project.ext.gaelykAppEngineVersion}"
testCompile "org.spockframework:spock-core:${project.ext.gaelykSpockVersion}", {
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
}
testCompile 'cglib:cglib-nodep:2.2.2'
@@ -131,12 +131,6 @@ artifacts {
archives javadocJar
}
tasks.withType(Upload) { // map the groovy configuration to compile in the pom
repositories.withType(MavenResolver) {
pom.scopeMappings.addMapping(1, configurations.groovy, 'compile')
}
}
if(hasProperty('nexusUsername') && hasProperty('nexusPassword')){
boolean signingEnabled = !hasProperty('skipSigning') || skipSigning != 'true'
if(signingEnabled){
@@ -151,7 +145,7 @@ if(hasProperty('nexusUsername') && hasProperty('nexusPassword')){
repositories {
mavenDeployer {
if(signingEnabled){
beforeDeployment { deployment -> signPom(deployment) }
beforeDeployment { deployment -> signing.signPom(deployment) }
}
def auth = {
@@ -235,7 +229,7 @@ if(hasProperty('nexusUsername') && hasProperty('nexusPassword')){
task docGDK {
// ext.extraDocGDKclasses = []
// project.ext.extraDocGDKclasses = []
dependsOn(':gaelyk-docgenerator:build')
// TODO don't hard-code these
ext.destinationDir = "$buildDir/html/groovy-jdk"
@@ -1,6 +1,6 @@
#Thu Mar 20 17:35:03 CET 2014
#Sat May 09 06:55:07 CEST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-bin.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-all.zip
@@ -25,7 +25,8 @@ import com.google.appengine.api.images.ImagesService
* @author Guillaume Laforge
*/
@Singleton
class ImagesServiceWrapper implements ImagesService {
class ImagesServiceWrapper {
@Delegate(deprecated = true) ImagesService service = ImagesServiceFactory.imagesService
def methodMissing(String name, args) {
@@ -1,34 +0,0 @@
/*
* Copyright 2009-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package groovyx.gaelyk.datastore
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention
import java.lang.annotation.Target
import static java.lang.annotation.ElementType.FIELD
import static java.lang.annotation.ElementType.METHOD
import static java.lang.annotation.RetentionPolicy.RUNTIME
/**
* Annotation for properties of a Groovy class that should be the ignored in coercion to and from entities.
*
* @author Guillaume Laforge
*/
@Retention(RUNTIME)
@Target([METHOD, FIELD])
@Inherited
@interface Ignore { }
@@ -0,0 +1,14 @@
package groovyx.gaelyk.datastore;
import java.lang.annotation.*;
/**
* Annotation for properties of a Groovy class that should be the ignored in coercion to and from entities.
*
* @author Guillaume Laforge
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
@Inherited
public @interface Ignore {
}
@@ -1,34 +0,0 @@
/*
* Copyright 2009-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package groovyx.gaelyk.datastore
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention
import java.lang.annotation.Target
import static java.lang.annotation.ElementType.FIELD
import static java.lang.annotation.ElementType.METHOD
import static java.lang.annotation.RetentionPolicy.RUNTIME
/**
* Annotation for properties of a Groovy class that should be set as indexed in coercion to and from entities.
*
* @author Vladimir Orany
*/
@Retention(RUNTIME)
@Target([METHOD, FIELD])
@Inherited
@interface Indexed { }
@@ -0,0 +1,14 @@
package groovyx.gaelyk.datastore;
import java.lang.annotation.*;
/**
* Annotation for properties of a Groovy class that should be set as indexed in coercion to and from entities.
*
* @author Vladimir Orany
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
@Inherited
public @interface Indexed {
}
@@ -1,33 +0,0 @@
/*
* Copyright 2009-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package groovyx.gaelyk.datastore
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention
import java.lang.annotation.Target
import static java.lang.annotation.RetentionPolicy.*
import static java.lang.annotation.ElementType.*
/**
* Annotation for properties of a Groovy class that should be the key used in coercion to and from entities.
*
* @author Guillaume Laforge
*/
@Retention(RUNTIME)
@Target([METHOD, FIELD])
@Inherited
@interface Key { }
@@ -0,0 +1,14 @@
package groovyx.gaelyk.datastore;
import java.lang.annotation.*;
/**
* Annotation for properties of a Groovy class that should be the key used in coercion to and from entities.
*
* @author Guillaume Laforge
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
@Inherited
public @interface Key {
}
@@ -1,38 +0,0 @@
/*
* Copyright 2009-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package groovyx.gaelyk.datastore
import static java.lang.annotation.ElementType.*
import static java.lang.annotation.RetentionPolicy.*
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention
import java.lang.annotation.Target
/**
* Annotation for properties of a Groovy class that should be the parent used in coercion to and from entities.
*
* The property must be of type {@link com.google.appengine.api.datastore.Key}
*
* @author Guillaume Laforge
*/
@Retention(RUNTIME)
@Target([METHOD, FIELD])
@Inherited
@interface Parent {
}
@@ -0,0 +1,16 @@
package groovyx.gaelyk.datastore;
import java.lang.annotation.*;
/**
* Annotation for properties of a Groovy class that should be the parent used in coercion to and from entities.
* <p/>
* The property must be of type {@link com.google.appengine.api.datastore.Key}
*
* @author Guillaume Laforge
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
@Inherited
public @interface Parent {
}
@@ -39,7 +39,7 @@ class SelfRestartingQueryResultIterator<T> implements QueryResultIteratorWithQue
new SelfRestartingQueryResultIterator(builder)
}
Object next(){
T next(){
try {
def next = currentIterator.next()
currentCursor = currentIterator.cursor
@@ -1,34 +0,0 @@
/*
* Copyright 2009-2012 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package groovyx.gaelyk.datastore
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention
import java.lang.annotation.Target
import static java.lang.annotation.ElementType.FIELD
import static java.lang.annotation.ElementType.METHOD
import static java.lang.annotation.RetentionPolicy.RUNTIME
/**
* Annotation for properties of a Groovy class that should be set as unindexed in coercion to and from entities.
*
* @author Guillaume Laforge
*/
@Retention(RUNTIME)
@Target([METHOD, FIELD])
@Inherited
@interface Unindexed { }
@@ -0,0 +1,14 @@
package groovyx.gaelyk.datastore;
import java.lang.annotation.*;
/**
* Annotation for properties of a Groovy class that should be set as unindexed in coercion to and from entities.
*
* @author Guillaume Laforge
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.METHOD, ElementType.FIELD})
@Inherited
public @interface Unindexed {
}
Oops, something went wrong.

0 comments on commit e228ce0

Please sign in to comment.