Skip to content

Updates for compatibility with Android Studio 2.2 #89

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
xelnaga wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updates for compatibility with Android Studio 2.2 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe658f3
Upgraded to Gradle 2.14.1, Android Tools 2.2.0-beta3 and Scala 2.11.8
Aug 28, 2016
7a38261
Increased version number
Aug 28, 2016
fc9d326
Upgraded to build tools 2.2.0
Sep 20, 2016
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
12 changes: 9 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@ apply plugin: "signing"
apply plugin: "idea"

repositories {

mavenCentral()

maven {
url "https://dl.bintray.com/android/android-tools/"
}
}

buildscript {
Expand All @@ -33,13 +38,14 @@ 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"
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."
group = "jp.leafytree.gradle"
version = "1.5-SNAPSHOT"
version = "2.2-SNAPSHOT"
sourceCompatibility = JavaVersion.VERSION_1_6
targetCompatibility = JavaVersion.VERSION_1_6

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion sample/hello/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion sample/libproject/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion sample/simple/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 0 additions & 2 deletions src/main/groovy/jp/leafytree/gradle/AndroidScalaPlugin.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -36,7 +35,6 @@ import java.util.concurrent.atomic.AtomicReference
*/
public class AndroidScalaPlugin implements Plugin<Project> {
private final FileResolver fileResolver
@VisibleForTesting
final Map<String, SourceDirectorySet> sourceDirectorySetMap = new HashMap<>()
private Project project
private Object androidPlugin
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/jp/leafytree/gradle/AndroidScalaPluginTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}