From fe658f37072afef559562be925977ab260de4ba6 Mon Sep 17 00:00:00 2001 From: Xelnaga Date: Sun, 28 Aug 2016 12:16:54 +0100 Subject: [PATCH 1/3] Upgraded to Gradle 2.14.1, Android Tools 2.2.0-beta3 and Scala 2.11.8 --- build.gradle | 10 ++++++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- sample/hello/gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- sample/simple/gradle/wrapper/gradle-wrapper.properties | 2 +- .../jp/leafytree/gradle/AndroidScalaPlugin.groovy | 2 -- .../jp/leafytree/gradle/AndroidScalaPluginTest.groovy | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index b394b59a..1059b725 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,12 @@ apply plugin: "signing" apply plugin: "idea" repositories { + mavenCentral() + + maven { + url "https://dl.bintray.com/android/android-tools/" + } } buildscript { @@ -33,8 +38,9 @@ dependencies { compile gradleApi() compile localGroovy() compile "commons-io:commons-io:2.4" - testCompile "com.android.tools.build:gradle:2.0.0" - testCompile "org.scala-lang:scala-compiler:2.11.7" + testCompile "com.android.tools.build:gradle:2.2.0-beta3" + testCompile "org.scala-lang:scala-compiler:2.11.8" + testCompile "junit:junit:4.12" } description "Gradle Android Scala Plugin adds scala language support to official gradle android plugin." diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c1a79025..5c91336e 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.12-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/sample/hello/gradle/wrapper/gradle-wrapper.properties b/sample/hello/gradle/wrapper/gradle-wrapper.properties index 6b762991..584ed59c 100644 --- a/sample/hello/gradle/wrapper/gradle-wrapper.properties +++ b/sample/hello/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.12-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/sample/libproject/gradle/wrapper/gradle-wrapper.properties b/sample/libproject/gradle/wrapper/gradle-wrapper.properties index a69fd761..7a6a8ea7 100644 --- a/sample/libproject/gradle/wrapper/gradle-wrapper.properties +++ b/sample/libproject/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.12-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/sample/simple/gradle/wrapper/gradle-wrapper.properties b/sample/simple/gradle/wrapper/gradle-wrapper.properties index 8895e262..b8e600c3 100644 --- a/sample/simple/gradle/wrapper/gradle-wrapper.properties +++ b/sample/simple/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-2.12-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/src/main/groovy/jp/leafytree/gradle/AndroidScalaPlugin.groovy b/src/main/groovy/jp/leafytree/gradle/AndroidScalaPlugin.groovy index 365239ac..d2083df1 100644 --- a/src/main/groovy/jp/leafytree/gradle/AndroidScalaPlugin.groovy +++ b/src/main/groovy/jp/leafytree/gradle/AndroidScalaPlugin.groovy @@ -14,7 +14,6 @@ * limitations under the License. */ package jp.leafytree.gradle -import com.google.common.annotations.VisibleForTesting import org.apache.commons.io.FileUtils import org.codehaus.groovy.runtime.InvokerHelper import org.gradle.api.Plugin @@ -36,7 +35,6 @@ import java.util.concurrent.atomic.AtomicReference */ public class AndroidScalaPlugin implements Plugin { private final FileResolver fileResolver - @VisibleForTesting final Map sourceDirectorySetMap = new HashMap<>() private Project project private Object androidPlugin diff --git a/src/test/groovy/jp/leafytree/gradle/AndroidScalaPluginTest.groovy b/src/test/groovy/jp/leafytree/gradle/AndroidScalaPluginTest.groovy index d408e9da..ea584320 100644 --- a/src/test/groovy/jp/leafytree/gradle/AndroidScalaPluginTest.groovy +++ b/src/test/groovy/jp/leafytree/gradle/AndroidScalaPluginTest.groovy @@ -150,6 +150,6 @@ class AndroidScalaPluginTest { @Test public void scalaVersionFromClasspath() { def classpath = System.getProperty("java.class.path").split(File.pathSeparator).collect { new File(it) } - Assert.assertEquals("2.11.7", AndroidScalaPlugin.scalaVersionFromClasspath(classpath)) + Assert.assertEquals("2.11.8", AndroidScalaPlugin.scalaVersionFromClasspath(classpath)) } } From 7a38261b18941b1411fe6b3b95ff04ea92afa473 Mon Sep 17 00:00:00 2001 From: Xelnaga Date: Sun, 28 Aug 2016 12:21:36 +0100 Subject: [PATCH 2/3] Increased version number --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1059b725..c03087d0 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ dependencies { description "Gradle Android Scala Plugin adds scala language support to official gradle android plugin." group = "jp.leafytree.gradle" -version = "1.5-SNAPSHOT" +version = "2.2-SNAPSHOT" sourceCompatibility = JavaVersion.VERSION_1_6 targetCompatibility = JavaVersion.VERSION_1_6 From fc9d3267aa2edf6442fea79084cce03ecd2bde34 Mon Sep 17 00:00:00 2001 From: Xelnaga Date: Tue, 20 Sep 2016 23:36:40 +0100 Subject: [PATCH 3/3] Upgraded to build tools 2.2.0 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index c03087d0..67558d0f 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ dependencies { compile gradleApi() compile localGroovy() compile "commons-io:commons-io:2.4" - testCompile "com.android.tools.build:gradle:2.2.0-beta3" + testCompile "com.android.tools.build:gradle:2.2.0" testCompile "org.scala-lang:scala-compiler:2.11.8" testCompile "junit:junit:4.12" }