Merge pull request #73 from Triple-T/gradle_2.3

Renamed plugin so it does not collide with gradle's internal play plu…
Triple-T · May 9, 2015 · 5733a1f · 5733a1f
2 parents 2b328ff + dcf1597
commit 5733a1f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git 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.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
diff --git a/...s/META-INF/gradle-plugins/play.properties → ...lugins/com.github.triplet.play.properties b/...s/META-INF/gradle-plugins/play.properties → ...lugins/com.github.triplet.play.properties
diff --git a/src/test/groovy/de/triplet/gradle/play/PlayPublisherPluginTest.groovy b/src/test/groovy/de/triplet/gradle/play/PlayPublisherPluginTest.groovy
@@ -14,7 +14,7 @@ class PlayPublisherPluginTest {
     public void testThrowsOnLibraryProjects() {
         Project project = ProjectBuilder.builder().build()
         project.apply plugin: 'com.android.library'
-        project.apply plugin: 'play'
+        project.apply plugin: 'com.github.triplet.play'
     }
 
     @Test

diff --git a/src/test/groovy/de/triplet/gradle/play/TestHelper.groovy b/src/test/groovy/de/triplet/gradle/play/TestHelper.groovy
@@ -10,7 +10,7 @@ public class TestHelper {
     public static Project evaluatableProject() {
         Project project = ProjectBuilder.builder().withProjectDir(FIXTURE_WORKING_DIR).build()
         project.apply plugin: 'com.android.application'
-        project.apply plugin: 'play'
+        project.apply plugin: 'com.github.triplet.play'
         project.android {
             compileSdkVersion 22
             buildToolsVersion '22.0.1'