Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Updated to Gradle 3.5 #146

Merged
merged 1 commit into from
Apr 14, 2017
Merged

Updated to Gradle 3.5 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'org.codehaus.groovy:groovy-android-gradle-plugin:1.0.0'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.2.0'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Sep 20 10:41:30 CDT 2016
#Fri Apr 14 08:59:00 CDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
10 changes: 10 additions & 0 deletions ...droid-gradle-plugin/src/main/groovy/groovyx/internal/DefaultAndroidGroovySourceSet.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package groovyx.internal

import groovyx.api.AndroidGroovySourceSet
import org.gradle.api.Action
import org.gradle.api.file.SourceDirectorySet
import org.gradle.api.internal.file.DefaultSourceDirectorySet
import org.gradle.api.internal.file.FileResolver
Expand Down Expand Up @@ -50,6 +51,15 @@ class DefaultAndroidGroovySourceSet implements AndroidGroovySourceSet {
}
}

/**
* Looks like this was added in Gradle 3.3 which was causing breaking issues. Leave Override off
* to prevent issues.
*/
GroovySourceSet groovy(Action<? super SourceDirectorySet> configureAction) {
configureAction.execute(groovy)
return this
}

@Override GroovySourceSet groovy(Closure configureClosure) {
ConfigureUtil.configure(configureClosure, groovy)
return this
Expand Down
4 changes: 3 additions & 1 deletion groovy-android-gradle-plugin/src/test/groovy/groovyx/functional/FullCompilationSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ class FullCompilationSpec extends FunctionalSpec {
'JavaVersion.VERSION_1_6' | '2.2.3' | '3.2'
'JavaVersion.VERSION_1_7' | '2.3.0' | '3.3'
'JavaVersion.VERSION_1_7' | '2.3.0' | '3.4'
'JavaVersion.VERSION_1_7' | '2.3.1' | '3.5'
}

@Unroll
Expand Down Expand Up @@ -391,7 +392,7 @@ class FullCompilationSpec extends FunctionalSpec {

where:
// test common configs that touches the different way to access the classpath
javaVersion | androidPluginVersion | gradleVersion
javaVersion | androidPluginVersion | gradleVersion
'JavaVersion.VERSION_1_6' | '1.1.0' | '2.2'
'JavaVersion.VERSION_1_6' | '1.3.0' | '2.2'
'JavaVersion.VERSION_1_6' | '1.5.0' | '2.10'
Expand All @@ -405,5 +406,6 @@ class FullCompilationSpec extends FunctionalSpec {
'JavaVersion.VERSION_1_6' | '2.2.3' | '3.2'
'JavaVersion.VERSION_1_7' | '2.3.0' | '3.3'
'JavaVersion.VERSION_1_7' | '2.3.0' | '3.4'
'JavaVersion.VERSION_1_7' | '2.3.1' | '3.5'
}
}